Module Name: src Committed By: christos Date: Wed May 22 17:26:05 UTC 2019
Modified Files: src/external/bsd/file/dist: ChangeLog config.h.in configure configure.ac src/external/bsd/file/dist/doc: file.1 magic.5 src/external/bsd/file/dist/magic: Makefile.am Makefile.in src/external/bsd/file/dist/magic/magdir: apple archive elf filesystems geo kml netbsd pgp src/external/bsd/file/dist/src: apprentice.c cdf.c cdf_time.c compress.c der.c encoding.c file.c file.h fsmagic.c funcs.c is_json.c magic.c print.c readcdf.c readelf.c softmagic.c src/external/bsd/file/include: config.h Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/ChangeLog cvs rdiff -u -r1.13 -r1.14 src/external/bsd/file/dist/config.h.in cvs rdiff -u -r1.20 -r1.21 src/external/bsd/file/dist/configure cvs rdiff -u -r1.16 -r1.17 src/external/bsd/file/dist/configure.ac cvs rdiff -u -r1.22 -r1.23 src/external/bsd/file/dist/doc/file.1 cvs rdiff -u -r1.19 -r1.20 src/external/bsd/file/dist/doc/magic.5 cvs rdiff -u -r1.16 -r1.17 src/external/bsd/file/dist/magic/Makefile.am cvs rdiff -u -r1.19 -r1.20 src/external/bsd/file/dist/magic/Makefile.in cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/magic/magdir/apple cvs rdiff -u -r1.15 -r1.16 src/external/bsd/file/dist/magic/magdir/archive cvs rdiff -u -r1.16 -r1.17 src/external/bsd/file/dist/magic/magdir/elf cvs rdiff -u -r1.14 -r1.15 \ src/external/bsd/file/dist/magic/magdir/filesystems cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/dist/magic/magdir/geo cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/file/dist/magic/magdir/kml cvs rdiff -u -r1.7 -r1.8 src/external/bsd/file/dist/magic/magdir/netbsd cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/magic/magdir/pgp cvs rdiff -u -r1.22 -r1.23 src/external/bsd/file/dist/src/apprentice.c \ src/external/bsd/file/dist/src/file.h cvs rdiff -u -r1.17 -r1.18 src/external/bsd/file/dist/src/cdf.c \ src/external/bsd/file/dist/src/compress.c cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/src/cdf_time.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/src/der.c cvs rdiff -u -r1.7 -r1.8 src/external/bsd/file/dist/src/encoding.c cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/dist/src/file.c cvs rdiff -u -r1.14 -r1.15 src/external/bsd/file/dist/src/fsmagic.c cvs rdiff -u -r1.15 -r1.16 src/external/bsd/file/dist/src/funcs.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/file/dist/src/is_json.c cvs rdiff -u -r1.13 -r1.14 src/external/bsd/file/dist/src/magic.c \ src/external/bsd/file/dist/src/print.c cvs rdiff -u -r1.16 -r1.17 src/external/bsd/file/dist/src/readcdf.c cvs rdiff -u -r1.20 -r1.21 src/external/bsd/file/dist/src/readelf.c cvs rdiff -u -r1.21 -r1.22 src/external/bsd/file/dist/src/softmagic.c cvs rdiff -u -r1.13 -r1.14 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.