Module Name:	basesrc
Committed By:	pooka
Date:		Thu Nov 23 23:21:16 UTC 2000

Modified Files:
	basesrc/usr.bin/file: ascmagic.c config.h file.1 file.c file.h magic.5
	    patchlevel.h readelf.c
	basesrc/usr.bin/file/magdir: audio elf images msdos sgi varied.out

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.15 -r1.16 basesrc/usr.bin/file/ascmagic.c
cvs rdiff -r1.4 -r1.5 basesrc/usr.bin/file/config.h
cvs rdiff -r1.17 -r1.18 basesrc/usr.bin/file/file.1
cvs rdiff -r1.18 -r1.19 basesrc/usr.bin/file/file.c
cvs rdiff -r1.20 -r1.21 basesrc/usr.bin/file/file.h
cvs rdiff -r1.14 -r1.15 basesrc/usr.bin/file/magic.5
cvs rdiff -r1.12 -r1.13 basesrc/usr.bin/file/patchlevel.h
cvs rdiff -r1.8 -r1.9 basesrc/usr.bin/file/readelf.c
cvs rdiff -r1.10 -r1.11 basesrc/usr.bin/file/magdir/audio \
    basesrc/usr.bin/file/magdir/images
cvs rdiff -r1.16 -r1.17 basesrc/usr.bin/file/magdir/elf
cvs rdiff -r1.5 -r1.6 basesrc/usr.bin/file/magdir/msdos
cvs rdiff -r1.4 -r1.5 basesrc/usr.bin/file/magdir/sgi
cvs rdiff -r1.8 -r1.9 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.