diff options
Diffstat (limited to 'usr.bin/file/patchlevel.h')
-rw-r--r-- | usr.bin/file/patchlevel.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/usr.bin/file/patchlevel.h b/usr.bin/file/patchlevel.h index cd11e2a2bdd88..64e79fea61b0a 100644 --- a/usr.bin/file/patchlevel.h +++ b/usr.bin/file/patchlevel.h @@ -3,20 +3,23 @@ /* * Patchlevel file for Ian Darwin's MAGIC command. - * $Id: patchlevel.h,v 1.7 1997/03/18 19:37:21 mpp Exp $ + * $Id: patchlevel.h,v 1.3.2.1 1997/08/18 18:59:16 jdp Exp $ * * $Log: patchlevel.h,v $ + * Revision 1.3.2.1 1997/08/18 18:59:16 jdp + * Sync with -current. + * * Revision 1.7 1997/03/18 19:37:21 mpp * Merge to resolve conflicts with file 3.22 merge. * * Revision 1.6 1997/02/22 19:54:59 peter - * Revert $FreeBSD$ to $Id: patchlevel.h,v 1.7 1997/03/18 19:37:21 mpp Exp $ + * Revert $FreeBSD$ to $Id: patchlevel.h,v 1.3.2.1 1997/08/18 18:59:16 jdp Exp $ * * Revision 1.5 1997/02/22 19:29:15 peter - * Revert $Id: patchlevel.h,v 1.7 1997/03/18 19:37:21 mpp Exp $ to $Id: patchlevel.h,v 1.7 1997/03/18 19:37:21 mpp Exp $ + * Revert $Id: patchlevel.h,v 1.3.2.1 1997/08/18 18:59:16 jdp Exp $ to $Id: patchlevel.h,v 1.3.2.1 1997/08/18 18:59:16 jdp Exp $ * * Revision 1.4 1997/01/14 06:59:48 jkh - * Make the long-awaited change from $Id: patchlevel.h,v 1.7 1997/03/18 19:37:21 mpp Exp $ to $Id: patchlevel.h,v 1.7 1997/03/18 19:37:21 mpp Exp $ + * Make the long-awaited change from $Id: patchlevel.h,v 1.3.2.1 1997/08/18 18:59:16 jdp Exp $ to $Id: patchlevel.h,v 1.3.2.1 1997/08/18 18:59:16 jdp Exp $ * * This will make a number of things easier in the future, as well as (finally!) * avoiding the Id-smashing problem which has plagued developers for so long. |