Date: Tue, 23 Jan 1996 04:40:39 -0800 (PST) From: Mike Pritchard <mpp> To: CVS-committers, cvs-usrbin Subject: cvs commit: src/usr.bin/file/Magdir pgp zyxel Message-ID: <199601231240.EAA11635@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
mpp 96/01/23 04:40:38
Modified: usr.bin/file apprentice.c ascmagic.c compress.c file.1
file.c file.h fsmagic.c magic.5 names.h
patchlevel.h print.c softmagic.c
usr.bin/file/Magdir pgp zyxel
Log:
Merged changes to resolve conflicts with file 3.19 import.
Revision Changes Path
1.3 +100 -29 src/usr.bin/file/apprentice.c
1.3 +23 -20 src/usr.bin/file/ascmagic.c
1.3 +7 -10 src/usr.bin/file/compress.c
1.3 +26 -29 src/usr.bin/file/file.1
1.3 +100 -27 src/usr.bin/file/file.c
1.3 +6 -3 src/usr.bin/file/file.h
1.3 +3 -1 src/usr.bin/file/fsmagic.c
1.3 +8 -8 src/usr.bin/file/magic.5
1.2 +7 -6 src/usr.bin/file/names.h
1.3 +40 -2 src/usr.bin/file/patchlevel.h
1.3 +5 -5 src/usr.bin/file/print.c
1.4 +20 -8 src/usr.bin/file/softmagic.c
1.3 +7 -6 src/usr.bin/file/Magdir/pgp
1.3 +11 -6 src/usr.bin/file/Magdir/zyxel
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199601231240.EAA11635>