Module Name: src
Committed By: christos
Date: Tue Dec 17 02:31:06 UTC 2019
Modified Files:
src/external/bsd/file/dist: ChangeLog Makefile.in aclocal.m4 compile
config.guess config.h.in config.sub configure configure.ac depcomp
missing
src/external/bsd/file/dist/doc: Makefile.in file.1 libmagic.3 magic.5
src/external/bsd/file/dist/magic: Makefile.am Makefile.in
src/external/bsd/file/dist/magic/magdir: apple archive elf filesystems
src/external/bsd/file/dist/python: Makefile.in
src/external/bsd/file/dist/src: Makefile.in apprentice.c cdf.c
compress.c encoding.c file.c file.h fsmagic.c funcs.c readcdf.c
readelf.c
src/external/bsd/file/dist/tests: Makefile.in
src/external/bsd/file/include: config.h
src/external/bsd/file/lib: Makefile
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/ChangeLog \
src/external/bsd/file/dist/missing
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/file/dist/Makefile.in \
src/external/bsd/file/dist/configure.ac
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/file/dist/aclocal.m4
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/file/dist/compile
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/dist/config.guess
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/file/dist/config.h.in
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/file/dist/config.sub
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/file/dist/configure
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/depcomp
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/dist/doc/Makefile.in
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/file/dist/doc/file.1
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/file/dist/doc/libmagic.3
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/file/dist/doc/magic.5
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/file/dist/magic/Makefile.am
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/file/dist/magic/Makefile.in
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/magic/magdir/apple
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/file/dist/magic/magdir/archive
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/file/dist/magic/magdir/elf
cvs rdiff -u -r1.15 -r1.16 \
src/external/bsd/file/dist/magic/magdir/filesystems
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/dist/python/Makefile.in
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/file/dist/src/Makefile.in \
src/external/bsd/file/dist/src/fsmagic.c
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/file/dist/src/apprentice.c \
src/external/bsd/file/dist/src/file.h
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/file/dist/src/cdf.c \
src/external/bsd/file/dist/src/compress.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/src/encoding.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/file/dist/src/file.c
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/file/dist/src/funcs.c
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/file/dist/src/readcdf.c
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/file/dist/src/readelf.c
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/file/dist/tests/Makefile.in
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/file/include/config.h
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
