Module Name:	src
Committed By:	pooka
Date:		Thu Sep 25 18:08:19 UTC 2003

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/magic/magdir: audio
	src/dist/file/src: Makefile.in file.h magic.c
Removed Files:
	src/dist/file/magic/magdir: cvs

Log Message:
post-import merge


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 src/dist/file/Makefile.in
cvs rdiff -r1.2 -r1.3 src/dist/file/aclocal.m4
cvs rdiff -r1.3 -r1.4 src/dist/file/config.h.in src/dist/file/configure \
    src/dist/file/configure.in
cvs rdiff -r1.3 -r1.4 src/dist/file/doc/Makefile.in src/dist/file/doc/file.1
cvs rdiff -r1.4 -r1.5 src/dist/file/doc/magic.5
cvs rdiff -r1.4 -r1.5 src/dist/file/magic/Makefile.in
cvs rdiff -r1.3 -r1.4 src/dist/file/magic/magdir/audio
cvs rdiff -r1.1.1.1 -r0 src/dist/file/magic/magdir/cvs
cvs rdiff -r1.3 -r1.4 src/dist/file/src/Makefile.in src/dist/file/src/file.h
cvs rdiff -r1.4 -r1.5 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.