Module Name: src Committed By: christos Date: Fri Feb 10 17:53:25 UTC 2017
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 jpeg netbsd pgp 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 magic.c print.c readcdf.c readelf.c softmagic.c src/external/bsd/file/dist/tests: Makefile.in src/external/bsd/file/include: config.h Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/dist/ChangeLog cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/dist/Makefile.in cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/aclocal.m4 cvs rdiff -u -r1.7 -r1.8 src/external/bsd/file/dist/compile \ src/external/bsd/file/dist/config.sub cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/config.guess cvs rdiff -u -r1.10 -r1.11 src/external/bsd/file/dist/config.h.in cvs rdiff -u -r1.14 -r1.15 src/external/bsd/file/dist/configure cvs rdiff -u -r1.11 -r1.12 src/external/bsd/file/dist/configure.ac cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/dist/depcomp cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/missing cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/doc/Makefile.in cvs rdiff -u -r1.17 -r1.18 src/external/bsd/file/dist/doc/file.1 cvs rdiff -u -r1.14 -r1.15 src/external/bsd/file/dist/doc/libmagic.3 \ src/external/bsd/file/dist/doc/magic.5 cvs rdiff -u -r1.11 -r1.12 src/external/bsd/file/dist/magic/Makefile.am cvs rdiff -u -r1.14 -r1.15 src/external/bsd/file/dist/magic/Makefile.in cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/dist/magic/magdir/apple cvs rdiff -u -r1.10 -r1.11 src/external/bsd/file/dist/magic/magdir/archive \ src/external/bsd/file/dist/magic/magdir/filesystems cvs rdiff -u -r1.13 -r1.14 src/external/bsd/file/dist/magic/magdir/elf cvs rdiff -u -r1.2 -r1.3 src/external/bsd/file/dist/magic/magdir/jpeg \ src/external/bsd/file/dist/magic/magdir/netbsd cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/dist/magic/magdir/pgp cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/python/Makefile.in cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/dist/src/Makefile.in \ src/external/bsd/file/dist/src/readcdf.c cvs rdiff -u -r1.14 -r1.15 src/external/bsd/file/dist/src/apprentice.c \ src/external/bsd/file/dist/src/file.h cvs rdiff -u -r1.11 -r1.12 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.10 -r1.11 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.4 -r1.5 src/external/bsd/file/dist/src/encoding.c cvs rdiff -u -r1.7 -r1.8 src/external/bsd/file/dist/src/file.c cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/src/print.c cvs rdiff -u -r1.13 -r1.14 src/external/bsd/file/dist/src/softmagic.c cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/tests/Makefile.in cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.