Module Name:	basesrc
Committed By:	christos
Date:		Sun May 14 22:53:39 UTC 2000

Modified Files:
	basesrc/usr.bin/file: MAINT Makefile apprentice.c ascmagic.c compress.c
	    config.h file.1 file.c file.h file2netbsd fsmagic.c magic.5 names.h
	    patchlevel.h print.c readelf.c softmagic.c
	basesrc/usr.bin/file/magdir: apple archive commands compress fonts
	    images ispell linux lisp msdos printer sgml sniffer

Log Message:
Resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 basesrc/usr.bin/file/MAINT
cvs rdiff -r1.23 -r1.24 basesrc/usr.bin/file/Makefile
cvs rdiff -r1.18 -r1.19 basesrc/usr.bin/file/apprentice.c \
    basesrc/usr.bin/file/file.h
cvs rdiff -r1.13 -r1.14 basesrc/usr.bin/file/ascmagic.c \
    basesrc/usr.bin/file/fsmagic.c basesrc/usr.bin/file/magic.5
cvs rdiff -r1.7 -r1.8 basesrc/usr.bin/file/compress.c
cvs rdiff -r1.2 -r1.3 basesrc/usr.bin/file/config.h
cvs rdiff -r1.15 -r1.16 basesrc/usr.bin/file/file.1 \
    basesrc/usr.bin/file/file.c
cvs rdiff -r1.3 -r1.4 basesrc/usr.bin/file/file2netbsd
cvs rdiff -r1.9 -r1.10 basesrc/usr.bin/file/names.h
cvs rdiff -r1.10 -r1.11 basesrc/usr.bin/file/patchlevel.h
cvs rdiff -r1.16 -r1.17 basesrc/usr.bin/file/print.c
cvs rdiff -r1.5 -r1.6 basesrc/usr.bin/file/readelf.c
cvs rdiff -r1.17 -r1.18 basesrc/usr.bin/file/softmagic.c
cvs rdiff -r1.4 -r1.5 basesrc/usr.bin/file/magdir/apple \
    basesrc/usr.bin/file/magdir/fonts basesrc/usr.bin/file/magdir/msdos
cvs rdiff -r1.7 -r1.8 basesrc/usr.bin/file/magdir/archive \
    basesrc/usr.bin/file/magdir/linux
cvs rdiff -r1.5 -r1.6 basesrc/usr.bin/file/magdir/commands \
    basesrc/usr.bin/file/magdir/printer basesrc/usr.bin/file/magdir/sgml
cvs rdiff -r1.9 -r1.10 basesrc/usr.bin/file/magdir/compress
cvs rdiff -r1.8 -r1.9 basesrc/usr.bin/file/magdir/images
cvs rdiff -r1.3 -r1.4 basesrc/usr.bin/file/magdir/ispell \
    basesrc/usr.bin/file/magdir/lisp 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.