CVS commit: src/dist/file

[Antti Kantee <pooka%netbsd.org@localhost>]

Module Name:    src
Committed By:   pooka
Date:           Thu Sep 16 13:49:07 UTC 2004

Modified Files:
        src/dist/file: configure configure.in file2netbsd
        src/dist/file/doc: file.1 magic.5
        src/dist/file/magic: Makefile.in
        src/dist/file/magic/magdir: audio sgi
        src/dist/file/src: apprentice.c file.c file.h magic.c readelf.c

Log Message:
conflict therapy


To generate a diff of this commit:
cvs rdiff -r1.8 -r1.9 src/dist/file/configure src/dist/file/configure.in
cvs rdiff -r1.9 -r1.10 src/dist/file/file2netbsd
cvs rdiff -r1.8 -r1.9 src/dist/file/doc/file.1 src/dist/file/doc/magic.5
cvs rdiff -r1.8 -r1.9 src/dist/file/magic/Makefile.in
cvs rdiff -r1.6 -r1.7 src/dist/file/magic/magdir/audio
cvs rdiff -r1.4 -r1.5 src/dist/file/magic/magdir/sgi
cvs rdiff -r1.4 -r1.5 src/dist/file/src/apprentice.c
cvs rdiff -r1.9 -r1.10 src/dist/file/src/file.c
cvs rdiff -r1.7 -r1.8 src/dist/file/src/file.h
cvs rdiff -r1.10 -r1.11 src/dist/file/src/magic.c
cvs rdiff -r1.5 -r1.6 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.