Module Name:	basesrc
Committed By:	pooka
Date:		Sun Sep  9 10:46:37 UTC 2001

Modified Files:
	basesrc/usr.bin/file: README apprentice.c ascmagic.c config.h file.1
	    file.c magic.5 patchlevel.h print.c softmagic.c
	basesrc/usr.bin/file/magdir: commands filesystems images sniffer

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.8 -r1.9 basesrc/usr.bin/file/README
cvs rdiff -r1.25 -r1.26 basesrc/usr.bin/file/apprentice.c
cvs rdiff -r1.16 -r1.17 basesrc/usr.bin/file/ascmagic.c
cvs rdiff -r1.7 -r1.8 basesrc/usr.bin/file/config.h
cvs rdiff -r1.22 -r1.23 basesrc/usr.bin/file/file.1
cvs rdiff -r1.23 -r1.24 basesrc/usr.bin/file/file.c
cvs rdiff -r1.17 -r1.18 basesrc/usr.bin/file/magic.5
cvs rdiff -r1.15 -r1.16 basesrc/usr.bin/file/patchlevel.h
cvs rdiff -r1.20 -r1.21 basesrc/usr.bin/file/print.c
cvs rdiff -r1.24 -r1.25 basesrc/usr.bin/file/softmagic.c
cvs rdiff -r1.7 -r1.8 basesrc/usr.bin/file/magdir/commands
cvs rdiff -r1.9 -r1.10 basesrc/usr.bin/file/magdir/filesystems
cvs rdiff -r1.13 -r1.14 basesrc/usr.bin/file/magdir/images
cvs rdiff -r1.6 -r1.7 basesrc/usr.bin/file/magdir/sniffer

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.