Module Name:	basesrc
Committed By:	pooka
Date:		Fri Sep 22 16:35:01 UTC 2000

Modified Files:
	basesrc/usr.bin/file: Header Makefile README apprentice.c ascmagic.c
	    compress.c file.1 file.c file.h fsmagic.c is_tar.c names.h
	    patchlevel.h print.c readelf.c softmagic.c
	basesrc/usr.bin/file/magdir: alpha animation apple commands database
	    filesystems images mail.news netbsd sniffer troff

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 basesrc/usr.bin/file/Header
cvs rdiff -r1.24 -r1.25 basesrc/usr.bin/file/Makefile
cvs rdiff -r1.6 -r1.7 basesrc/usr.bin/file/README
cvs rdiff -r1.19 -r1.20 basesrc/usr.bin/file/apprentice.c \
    basesrc/usr.bin/file/file.h
cvs rdiff -r1.14 -r1.15 basesrc/usr.bin/file/ascmagic.c \
    basesrc/usr.bin/file/fsmagic.c
cvs rdiff -r1.8 -r1.9 basesrc/usr.bin/file/compress.c
cvs rdiff -r1.16 -r1.17 basesrc/usr.bin/file/file.1 \
    basesrc/usr.bin/file/file.c
cvs rdiff -r1.11 -r1.12 basesrc/usr.bin/file/is_tar.c \
    basesrc/usr.bin/file/patchlevel.h
cvs rdiff -r1.10 -r1.11 basesrc/usr.bin/file/names.h
cvs rdiff -r1.17 -r1.18 basesrc/usr.bin/file/print.c
cvs rdiff -r1.7 -r1.8 basesrc/usr.bin/file/readelf.c
cvs rdiff -r1.18 -r1.19 basesrc/usr.bin/file/softmagic.c
cvs rdiff -r1.2 -r1.3 basesrc/usr.bin/file/magdir/alpha \
    basesrc/usr.bin/file/magdir/troff
cvs rdiff -r1.5 -r1.6 basesrc/usr.bin/file/magdir/animation \
    basesrc/usr.bin/file/magdir/apple basesrc/usr.bin/file/magdir/mail.news
cvs rdiff -r1.6 -r1.7 basesrc/usr.bin/file/magdir/commands \
    basesrc/usr.bin/file/magdir/database
cvs rdiff -r1.3 -r1.4 basesrc/usr.bin/file/magdir/filesystems
cvs rdiff -r1.9 -r1.10 basesrc/usr.bin/file/magdir/images
cvs rdiff -r1.13 -r1.14 basesrc/usr.bin/file/magdir/netbsd
cvs rdiff -r1.4 -r1.5 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.