Module Name:	src
Committed By:	pooka
Date:		Thu Apr  8 12:29:45 UTC 2004

Modified Files:
	src/dist/file: Makefile.in aclocal.m4 config.h.in configure
	    configure.in
	src/dist/file/doc: Makefile.in file.1 magic.5
	src/dist/file/magic: Makefile.in
	src/dist/file/src: Makefile.in magic.c

Log Message:
the conflict peril was no more


To generate a diff of this commit:
cvs rdiff -r1.7 -r1.8 src/dist/file/Makefile.in
cvs rdiff -r1.5 -r1.6 src/dist/file/aclocal.m4 src/dist/file/config.h.in
cvs rdiff -r1.6 -r1.7 src/dist/file/configure src/dist/file/configure.in
cvs rdiff -r1.6 -r1.7 src/dist/file/doc/Makefile.in
cvs rdiff -r1.7 -r1.8 src/dist/file/doc/file.1 src/dist/file/doc/magic.5
cvs rdiff -r1.7 -r1.8 src/dist/file/magic/Makefile.in
cvs rdiff -r1.7 -r1.8 src/dist/file/src/Makefile.in
cvs rdiff -r1.8 -r1.9 src/dist/file/src/magic.c

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