CVS commit: src/external/bsd/file

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Fri Jan  2 21:15:32 UTC 2015

Modified Files:
        src/external/bsd/file/dist: ChangeLog Makefile.in configure
            configure.ac
        src/external/bsd/file/dist/doc: file.1 libmagic.3 magic.5
        src/external/bsd/file/dist/magic: Makefile.am Makefile.in
        src/external/bsd/file/dist/magic/magdir: filesystems pgp
        src/external/bsd/file/dist/src: Makefile.in apprentice.c cdf.c
            cdf_time.c compress.c encoding.c file.c file.h fsmagic.c funcs.c
            magic.c print.c readcdf.c readelf.c softmagic.c
        src/external/bsd/file/include: config.h
        src/external/bsd/file/lib: shlib_version

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/file/dist/ChangeLog
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/file/dist/Makefile.in
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/file/dist/configure
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/file/dist/configure.ac
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/file/dist/doc/file.1
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/file/dist/doc/libmagic.3 \
    src/external/bsd/file/dist/doc/magic.5
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/file/dist/magic/Makefile.am
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/file/dist/magic/Makefile.in
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/magic/magdir/filesystems
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/file/dist/magic/magdir/pgp
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/file/dist/src/Makefile.in \
    src/external/bsd/file/dist/src/readcdf.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/file/dist/src/apprentice.c \
    src/external/bsd/file/dist/src/file.h
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/file/dist/src/cdf.c \
    src/external/bsd/file/dist/src/fsmagic.c \
    src/external/bsd/file/dist/src/readelf.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/src/cdf_time.c \
    src/external/bsd/file/dist/src/file.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/src/compress.c \
    src/external/bsd/file/dist/src/funcs.c \
    src/external/bsd/file/dist/src/magic.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/dist/src/encoding.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/file/dist/src/print.c
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/dist/src/softmagic.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/file/include/config.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/lib/shlib_version

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