diff options
| author | christos <christos@NetBSD.org> | 2000-05-14 22:53:37 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2000-05-14 22:53:37 +0000 |
| commit | 5d9fa0390de3ebb44f11c243dafeb9e6ced74e9f (patch) | |
| tree | 4311f9443e8197de8cf2aa765ab31000e0ad1a87 /usr.bin/file/patchlevel.h | |
| parent | 950e36ed1f28feb06d492f5d042df07cc4e2a579 (diff) | |
Resolve conflicts
Diffstat (limited to 'usr.bin/file/patchlevel.h')
| -rw-r--r-- | usr.bin/file/patchlevel.h | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/usr.bin/file/patchlevel.h b/usr.bin/file/patchlevel.h index 3e2cb3cbf9b..64b1f2c36df 100644 --- a/usr.bin/file/patchlevel.h +++ b/usr.bin/file/patchlevel.h @@ -1,13 +1,32 @@ -/* $NetBSD: patchlevel.h,v 1.10 1999/11/01 17:39:26 christos Exp $ */ +/* $NetBSD: patchlevel.h,v 1.11 2000/05/14 22:53:38 christos Exp $ */ #define FILE_VERSION_MAJOR 3 -#define patchlevel 28 +#define patchlevel 31 /* * Patchlevel file for Ian Darwin's MAGIC command. - * Id: patchlevel.h,v 1.28 1999/10/31 22:11:48 christos Exp + * Id: patchlevel.h,v 1.31 2000/05/14 17:58:36 christos Exp * * Log: patchlevel.h,v + * Revision 1.31 2000/05/14 17:58:36 christos + * - new magic for claris files + * - new magic for mathematica and maple files + * - new magic for msvc files + * - new -k flag to keep going matching all possible entries + * - add the word executable on #! magic files, and fix the usage of + * the word script + * - lots of other magic fixes + * - fix typo test -> text + * + * Revision 1.30 2000/04/11 02:41:17 christos + * - add support for mime output (-i) + * - make sure we free memory in case realloc fails + * - magic fixes + * + * Revision 1.29 1999/11/28 20:02:29 christos + * new string/[Bcb] magic from anton, and adjustments to the magic files to + * use it. + * * Revision 1.28 1999/10/31 22:11:48 christos * - add "char" type for compatibility with HP/UX * - recognize HP/UX syntax &=n etc. |
