diff options
| author | obrien <obrien@FreeBSD.org> | 2009-01-02 03:10:55 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2009-01-02 03:10:55 +0000 |
| commit | 729acffa050ba99227c27884a5760fdd3d6959b2 (patch) | |
| tree | d5289d633f1b84fbbf947f98b34ff58109fccca7 /contrib/file/Magdir/java | |
| parent | 964611a3050b11c026667dbb4ae98380fe18252a (diff) | |
| parent | 05dd1f1bd993ec12015e6782ea5c46b6a0b69ecb (diff) | |
| download | FreeBSD-src-729acffa050ba99227c27884a5760fdd3d6959b2.zip FreeBSD-src-729acffa050ba99227c27884a5760fdd3d6959b2.tar.gz | |
Record that base/vendor/file/dist@186675 was merged.
Merge base/vendor/file/dist@186675@186690, bringing FILE 4.26 to 8-CURRENT.
Diffstat (limited to 'contrib/file/Magdir/java')
| -rw-r--r-- | contrib/file/Magdir/java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/file/Magdir/java b/contrib/file/Magdir/java index 971b72ce..cca5542 100644 --- a/contrib/file/Magdir/java +++ b/contrib/file/Magdir/java @@ -9,8 +9,9 @@ >2 beshort >0x0004 \b, version %d 0 belong 0xfeedfeed Java KeyStore - +!:mime application/x-java-keystore 0 belong 0xcececece Java JCE KeyStore +!:mime application/x-java-jce-keystore # Dalvik .dex format. http://retrodev.com/android/dexformat.html # From <mkf@google.com> "Mike Fleming" |
