Module Name:	basesrc
Committed By:	pooka
Date:		Sun Jul 22 22:53:06 UTC 2001

Modified Files:
	basesrc/usr.bin/file: apprentice.c compress.c config.h file.1 file.c
	    file.h magic.5 magic.mime patchlevel.h print.c softmagic.c
	basesrc/usr.bin/file/magdir: animation apple archive audio database elf
	    filesystems freebsd images jpeg magic mail.news motorola msdos
	    sniffer softquad

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.23 -r1.24 basesrc/usr.bin/file/apprentice.c \
    basesrc/usr.bin/file/file.h
cvs rdiff -r1.9 -r1.10 basesrc/usr.bin/file/compress.c
cvs rdiff -r1.6 -r1.7 basesrc/usr.bin/file/config.h
cvs rdiff -r1.21 -r1.22 basesrc/usr.bin/file/file.1
cvs rdiff -r1.20 -r1.21 basesrc/usr.bin/file/file.c
cvs rdiff -r1.16 -r1.17 basesrc/usr.bin/file/magic.5
cvs rdiff -r1.3 -r1.4 basesrc/usr.bin/file/magic.mime
cvs rdiff -r1.14 -r1.15 basesrc/usr.bin/file/patchlevel.h
cvs rdiff -r1.19 -r1.20 basesrc/usr.bin/file/print.c
cvs rdiff -r1.22 -r1.23 basesrc/usr.bin/file/softmagic.c
cvs rdiff -r1.7 -r1.8 basesrc/usr.bin/file/magdir/animation \
    basesrc/usr.bin/file/magdir/database basesrc/usr.bin/file/magdir/msdos
cvs rdiff -r1.6 -r1.7 basesrc/usr.bin/file/magdir/apple \
    basesrc/usr.bin/file/magdir/mail.news
cvs rdiff -r1.10 -r1.11 basesrc/usr.bin/file/magdir/archive
cvs rdiff -r1.11 -r1.12 basesrc/usr.bin/file/magdir/audio
cvs rdiff -r1.20 -r1.21 basesrc/usr.bin/file/magdir/elf
cvs rdiff -r1.4 -r1.5 basesrc/usr.bin/file/magdir/filesystems \
    basesrc/usr.bin/file/magdir/magic
cvs rdiff -r1.2 -r1.3 basesrc/usr.bin/file/magdir/freebsd
cvs rdiff -r1.12 -r1.13 basesrc/usr.bin/file/magdir/images
cvs rdiff -r1.3 -r1.4 basesrc/usr.bin/file/magdir/jpeg \
    basesrc/usr.bin/file/magdir/motorola
cvs rdiff -r1.5 -r1.6 basesrc/usr.bin/file/magdir/sniffer
cvs rdiff -r1.8 -r1.9 basesrc/usr.bin/file/magdir/softquad

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