Module Name:	basesrc
Committed By:	pooka
Date:		Sat May 18 07:00:51 UTC 2002

Modified Files:
	basesrc/usr.bin/file: README apprentice.c compress.c config.h file.1
	    file.c file.h is_tar.c magic.5 magic.mime.in names.h patchlevel.h
	    print.c readelf.c readelf.h softmagic.c
	basesrc/usr.bin/file/magdir: amigaos animation audio commands compress
	    elf filesystems images linux lisp mcrypt printer sendmail tex
	    varied.out

Log Message:
conflict therapy


To generate a diff of this commit:
cvs rdiff -r1.9 -r1.10 basesrc/usr.bin/file/README
cvs rdiff -r1.27 -r1.28 basesrc/usr.bin/file/apprentice.c
cvs rdiff -r1.10 -r1.11 basesrc/usr.bin/file/compress.c
cvs rdiff -r1.8 -r1.9 basesrc/usr.bin/file/config.h \
    basesrc/usr.bin/file/readelf.h
cvs rdiff -r1.25 -r1.26 basesrc/usr.bin/file/file.1 \
    basesrc/usr.bin/file/softmagic.c
cvs rdiff -r1.24 -r1.25 basesrc/usr.bin/file/file.c \
    basesrc/usr.bin/file/file.h
cvs rdiff -r1.12 -r1.13 basesrc/usr.bin/file/is_tar.c \
    basesrc/usr.bin/file/readelf.c
cvs rdiff -r1.20 -r1.21 basesrc/usr.bin/file/magic.5
cvs rdiff -r1.1 -r1.2 basesrc/usr.bin/file/magic.mime.in
cvs rdiff -r1.11 -r1.12 basesrc/usr.bin/file/names.h
cvs rdiff -r1.16 -r1.17 basesrc/usr.bin/file/patchlevel.h
cvs rdiff -r1.22 -r1.23 basesrc/usr.bin/file/print.c
cvs rdiff -r1.4 -r1.5 basesrc/usr.bin/file/magdir/amigaos \
    basesrc/usr.bin/file/magdir/tex
cvs rdiff -r1.8 -r1.9 basesrc/usr.bin/file/magdir/animation \
    basesrc/usr.bin/file/magdir/commands basesrc/usr.bin/file/magdir/linux
cvs rdiff -r1.12 -r1.13 basesrc/usr.bin/file/magdir/audio
cvs rdiff -r1.10 -r1.11 basesrc/usr.bin/file/magdir/compress \
    basesrc/usr.bin/file/magdir/filesystems
cvs rdiff -r1.23 -r1.24 basesrc/usr.bin/file/magdir/elf
cvs rdiff -r1.14 -r1.15 basesrc/usr.bin/file/magdir/images
cvs rdiff -r1.5 -r1.6 basesrc/usr.bin/file/magdir/lisp
cvs rdiff -r1.1 -r1.2 basesrc/usr.bin/file/magdir/mcrypt
cvs rdiff -r1.6 -r1.7 basesrc/usr.bin/file/magdir/printer
cvs rdiff -r1.2 -r1.3 basesrc/usr.bin/file/magdir/sendmail
cvs rdiff -r1.9 -r1.10 basesrc/usr.bin/file/magdir/varied.out

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