Module Name:	src
Committed By:	pooka
Date:		Mon Dec 13 10:35:04 UTC 2004

Modified Files:
	src/dist/file: LEGAL.NOTICE Makefile.in aclocal.m4 config.h.in
	    configure configure.in file2netbsd
	src/dist/file/doc: Makefile.in file.1 libmagic.3 magic.5
	src/dist/file/magic: Makefile.in
	src/dist/file/magic/magdir: audio
	src/dist/file/src: Makefile.in apprentice.c file.c file.h fsmagic.c
	    magic.c readelf.c

Log Message:
munge conflicts


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 src/dist/file/LEGAL.NOTICE
cvs rdiff -r1.8 -r1.9 src/dist/file/Makefile.in
cvs rdiff -r1.6 -r1.7 src/dist/file/aclocal.m4
cvs rdiff -r1.7 -r1.8 src/dist/file/config.h.in
cvs rdiff -r1.9 -r1.10 src/dist/file/configure src/dist/file/configure.in
cvs rdiff -r1.10 -r1.11 src/dist/file/file2netbsd
cvs rdiff -r1.7 -r1.8 src/dist/file/doc/Makefile.in
cvs rdiff -r1.9 -r1.10 src/dist/file/doc/file.1 src/dist/file/doc/magic.5
cvs rdiff -r1.2 -r1.3 src/dist/file/doc/libmagic.3
cvs rdiff -r1.9 -r1.10 src/dist/file/magic/Makefile.in
cvs rdiff -r1.7 -r1.8 src/dist/file/magic/magdir/audio
cvs rdiff -r1.8 -r1.9 src/dist/file/src/Makefile.in src/dist/file/src/file.h
cvs rdiff -r1.5 -r1.6 src/dist/file/src/apprentice.c
cvs rdiff -r1.10 -r1.11 src/dist/file/src/file.c
cvs rdiff -r1.2 -r1.3 src/dist/file/src/fsmagic.c
cvs rdiff -r1.11 -r1.12 src/dist/file/src/magic.c
cvs rdiff -r1.6 -r1.7 src/dist/file/src/readelf.c

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