Module Name:	src
Committed By:	pooka
Date:		Mon Oct 17 18:00:00 UTC 2005

Modified Files:
	src/dist/file: Makefile.in aclocal.m4 config.h.in configure
	    configure.in file2netbsd ltmain.sh
	src/dist/file/doc: Makefile.in file.1 magic.5
	src/dist/file/magic: Makefile.in
	src/dist/file/magic/magdir: audio perl riff sgi
	src/dist/file/src: Makefile.in 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 readelf.h softmagic.c tar.h test.c

Log Message:
con conflicts into going away


To generate a diff of this commit:
cvs rdiff -r1.12 -r1.13 src/dist/file/Makefile.in
cvs rdiff -r1.10 -r1.11 src/dist/file/aclocal.m4
cvs rdiff -r1.9 -r1.10 src/dist/file/config.h.in
cvs rdiff -r1.14 -r1.15 src/dist/file/configure
cvs rdiff -r1.13 -r1.14 src/dist/file/configure.in src/dist/file/file2netbsd
cvs rdiff -r1.3 -r1.4 src/dist/file/ltmain.sh
cvs rdiff -r1.10 -r1.11 src/dist/file/doc/Makefile.in
cvs rdiff -r1.11 -r1.12 src/dist/file/doc/file.1 src/dist/file/doc/magic.5
cvs rdiff -r1.12 -r1.13 src/dist/file/magic/Makefile.in
cvs rdiff -r1.8 -r1.9 src/dist/file/magic/magdir/audio
cvs rdiff -r1.2 -r1.3 src/dist/file/magic/magdir/perl
cvs rdiff -r1.5 -r1.6 src/dist/file/magic/magdir/riff \
    src/dist/file/magic/magdir/sgi
cvs rdiff -r1.11 -r1.12 src/dist/file/src/Makefile.in
cvs rdiff -r1.8 -r1.9 src/dist/file/src/apprentice.c
cvs rdiff -r1.2 -r1.3 src/dist/file/src/ascmagic.c \
    src/dist/file/src/compress.c src/dist/file/src/funcs.c \
    src/dist/file/src/is_tar.c src/dist/file/src/magic.h \
    src/dist/file/src/names.h src/dist/file/src/patchlevel.h \
    src/dist/file/src/print.c src/dist/file/src/readelf.h \
    src/dist/file/src/softmagic.c src/dist/file/src/tar.h \
    src/dist/file/src/test.c
cvs rdiff -r1.12 -r1.13 src/dist/file/src/file.c
cvs rdiff -r1.10 -r1.11 src/dist/file/src/file.h
cvs rdiff -r1.4 -r1.5 src/dist/file/src/fsmagic.c
cvs rdiff -r1.13 -r1.14 src/dist/file/src/magic.c
cvs rdiff -r1.7 -r1.8 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.