Module Name:	src
Committed By:	pooka
Date:		Sun Mar  4 15:22:11 UTC 2007

Modified Files:
	src/dist/file: LEGAL.NOTICE MAINT README config.h.in configure
	    configure.in file2netbsd
	src/dist/file/doc: file.1 libmagic.3 magic.5
	src/dist/file/magic: Makefile.in magic.mime
	src/dist/file/magic/magdir: archive audio commands filesystems msdos
	    perl riff
	src/dist/file/src: apprentice.c ascmagic.c compress.c file.c file.h
	    fsmagic.c funcs.c is_tar.c magic.c magic.h names.h patchlevel.h
	    print.c readelf.c softmagic.c tar.h test.c

Log Message:
apply conflict therapy for 4.20 import


To generate a diff of this commit:
cvs rdiff -r1.5 -r1.6 src/dist/file/LEGAL.NOTICE src/dist/file/README
cvs rdiff -r1.4 -r1.5 src/dist/file/MAINT
cvs rdiff -r1.11 -r1.12 src/dist/file/config.h.in
cvs rdiff -r1.16 -r1.17 src/dist/file/configure
cvs rdiff -r1.15 -r1.16 src/dist/file/configure.in src/dist/file/file2netbsd
cvs rdiff -r1.13 -r1.14 src/dist/file/doc/file.1 src/dist/file/doc/magic.5
cvs rdiff -r1.6 -r1.7 src/dist/file/doc/libmagic.3
cvs rdiff -r1.14 -r1.15 src/dist/file/magic/Makefile.in
cvs rdiff -r1.3 -r1.4 src/dist/file/magic/magic.mime
cvs rdiff -r1.5 -r1.6 src/dist/file/magic/magdir/archive
cvs rdiff -r1.10 -r1.11 src/dist/file/magic/magdir/audio
cvs rdiff -r1.3 -r1.4 src/dist/file/magic/magdir/commands \
    src/dist/file/magic/magdir/filesystems src/dist/file/magic/magdir/perl
cvs rdiff -r1.4 -r1.5 src/dist/file/magic/magdir/msdos
cvs rdiff -r1.7 -r1.8 src/dist/file/magic/magdir/riff
cvs rdiff -r1.13 -r1.14 src/dist/file/src/apprentice.c \
    src/dist/file/src/file.h
cvs rdiff -r1.4 -r1.5 src/dist/file/src/ascmagic.c \
    src/dist/file/src/compress.c src/dist/file/src/is_tar.c \
    src/dist/file/src/tar.h
cvs rdiff -r1.16 -r1.17 src/dist/file/src/file.c
cvs rdiff -r1.5 -r1.6 src/dist/file/src/fsmagic.c \
    src/dist/file/src/patchlevel.h src/dist/file/src/print.c
cvs rdiff -r1.6 -r1.7 src/dist/file/src/funcs.c
cvs rdiff -r1.15 -r1.16 src/dist/file/src/magic.c
cvs rdiff -r1.3 -r1.4 src/dist/file/src/magic.h src/dist/file/src/names.h \
    src/dist/file/src/test.c
cvs rdiff -r1.12 -r1.13 src/dist/file/src/readelf.c
cvs rdiff -r1.7 -r1.8 src/dist/file/src/softmagic.c

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