CVS commit: src/dist/file

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

Module Name:    src
Committed By:   pooka
Date:           Mon Oct 27 16:22:36 UTC 2003

Modified Files:
        src/dist/file: Makefile.in aclocal.m4 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 riff sgi
        src/dist/file/src: Makefile.in apprentice.c file.c file.h magic.c
            readelf.c

Log Message:
merge conflicts from 4.06 import


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