--- - branch: MAIN date: Fri Oct 19 00:11:48 UTC 2018 files: - new: '1.8' old: '1.7' path: src/external/bsd/file/dist/ChangeLog pathrev: src/external/bsd/file/dist/ChangeLog@1.8 type: modified - new: '1.8' old: '1.7' path: src/external/bsd/file/dist/depcomp pathrev: src/external/bsd/file/dist/depcomp@1.8 type: modified - new: '1.17' old: '1.16' path: src/external/bsd/file/dist/Makefile.in pathrev: src/external/bsd/file/dist/Makefile.in@1.17 type: modified - new: '1.13' old: '1.12' path: src/external/bsd/file/dist/aclocal.m4 pathrev: src/external/bsd/file/dist/aclocal.m4@1.13 type: modified - new: '1.13' old: '1.12' path: src/external/bsd/file/dist/config.h.in pathrev: src/external/bsd/file/dist/config.h.in@1.13 type: modified - new: '1.10' old: '1.9' path: src/external/bsd/file/dist/compile pathrev: src/external/bsd/file/dist/compile@1.10 type: modified - new: '1.12' old: '1.11' path: src/external/bsd/file/dist/config.guess pathrev: src/external/bsd/file/dist/config.guess@1.12 type: modified - new: '1.12' old: '1.11' path: src/external/bsd/file/dist/install-sh pathrev: src/external/bsd/file/dist/install-sh@1.12 type: modified - new: '1.11' old: '1.10' path: src/external/bsd/file/dist/config.sub pathrev: src/external/bsd/file/dist/config.sub@1.11 type: modified - new: '1.20' old: '1.19' path: src/external/bsd/file/dist/configure pathrev: src/external/bsd/file/dist/configure@1.20 type: modified - new: '1.16' old: '1.15' path: src/external/bsd/file/dist/configure.ac pathrev: src/external/bsd/file/dist/configure.ac@1.16 type: modified - new: '1.9' old: '1.8' path: src/external/bsd/file/dist/missing pathrev: src/external/bsd/file/dist/missing@1.9 type: modified - new: '1.12' old: '1.11' path: src/external/bsd/file/dist/doc/Makefile.in pathrev: src/external/bsd/file/dist/doc/Makefile.in@1.12 type: modified - new: '1.22' old: '1.21' path: src/external/bsd/file/dist/doc/file.1 pathrev: src/external/bsd/file/dist/doc/file.1@1.22 type: modified - new: '1.18' old: '1.17' path: src/external/bsd/file/dist/doc/libmagic.3 pathrev: src/external/bsd/file/dist/doc/libmagic.3@1.18 type: modified - new: '1.19' old: '1.18' path: src/external/bsd/file/dist/doc/magic.5 pathrev: src/external/bsd/file/dist/doc/magic.5@1.19 type: modified - new: '1.16' old: '1.15' path: src/external/bsd/file/dist/magic/Makefile.am pathrev: src/external/bsd/file/dist/magic/Makefile.am@1.16 type: modified - new: '1.19' old: '1.18' path: src/external/bsd/file/dist/magic/Makefile.in pathrev: src/external/bsd/file/dist/magic/Makefile.in@1.19 type: modified - new: '1.15' old: '1.14' path: src/external/bsd/file/dist/magic/magdir/archive pathrev: src/external/bsd/file/dist/magic/magdir/archive@1.15 type: modified - new: '1.16' old: '1.15' path: src/external/bsd/file/dist/magic/magdir/elf pathrev: src/external/bsd/file/dist/magic/magdir/elf@1.16 type: modified - new: '1.5' old: '1.4' path: src/external/bsd/file/dist/magic/magdir/jpeg pathrev: src/external/bsd/file/dist/magic/magdir/jpeg@1.5 type: modified - new: '1.12' old: '1.11' path: src/external/bsd/file/dist/python/Makefile.in pathrev: src/external/bsd/file/dist/python/Makefile.in@1.12 type: modified - new: '0' old: 1.1.1.3 path: src/external/bsd/file/dist/python/README pathrev: src/external/bsd/file/dist/python/README@0 type: deleted - new: '1.15' old: '1.14' path: src/external/bsd/file/dist/src/Makefile.in pathrev: src/external/bsd/file/dist/src/Makefile.in@1.15 type: modified - new: '1.15' old: '1.14' path: src/external/bsd/file/dist/src/funcs.c pathrev: src/external/bsd/file/dist/src/funcs.c@1.15 type: modified - new: '1.21' old: '1.20' path: src/external/bsd/file/dist/src/apprentice.c pathrev: src/external/bsd/file/dist/src/apprentice.c@1.21 type: modified - new: '1.17' old: '1.16' path: src/external/bsd/file/dist/src/cdf.c pathrev: src/external/bsd/file/dist/src/cdf.c@1.17 type: modified - new: '1.9' old: '1.8' path: src/external/bsd/file/dist/src/cdf_time.c pathrev: src/external/bsd/file/dist/src/cdf_time.c@1.9 type: modified - new: '1.16' old: '1.15' path: src/external/bsd/file/dist/src/compress.c pathrev: src/external/bsd/file/dist/src/compress.c@1.16 type: modified - new: '1.16' old: '1.15' path: src/external/bsd/file/dist/src/readcdf.c pathrev: src/external/bsd/file/dist/src/readcdf.c@1.16 type: modified - new: '1.4' old: '1.3' path: src/external/bsd/file/dist/src/der.c pathrev: src/external/bsd/file/dist/src/der.c@1.4 type: modified - new: '1.7' old: '1.6' path: src/external/bsd/file/dist/src/encoding.c pathrev: src/external/bsd/file/dist/src/encoding.c@1.7 type: modified - new: '1.12' old: '1.11' path: src/external/bsd/file/dist/src/file.c pathrev: src/external/bsd/file/dist/src/file.c@1.12 type: modified - new: '1.12' old: '1.11' path: src/external/bsd/file/dist/src/print.c pathrev: src/external/bsd/file/dist/src/print.c@1.12 type: modified - new: '1.20' old: '1.19' path: src/external/bsd/file/dist/src/file.h pathrev: src/external/bsd/file/dist/src/file.h@1.20 type: modified - new: '1.20' old: '1.19' path: src/external/bsd/file/dist/src/softmagic.c pathrev: src/external/bsd/file/dist/src/softmagic.c@1.20 type: modified - new: '1.14' old: '1.13' path: src/external/bsd/file/dist/src/fsmagic.c pathrev: src/external/bsd/file/dist/src/fsmagic.c@1.14 type: modified - new: '1.13' old: '1.12' path: src/external/bsd/file/dist/src/magic.c pathrev: src/external/bsd/file/dist/src/magic.c@1.13 type: modified - new: '1.18' old: '1.17' path: src/external/bsd/file/dist/src/readelf.c pathrev: src/external/bsd/file/dist/src/readelf.c@1.18 type: modified - new: '1.14' old: '1.13' path: src/external/bsd/file/dist/tests/Makefile.in pathrev: src/external/bsd/file/dist/tests/Makefile.in@1.14 type: modified - new: '1.13' old: '1.12' path: src/external/bsd/file/include/config.h pathrev: src/external/bsd/file/include/config.h@1.13 type: modified - new: '1.10' old: '1.9' path: src/external/bsd/file/lib/Makefile pathrev: src/external/bsd/file/lib/Makefile@1.10 type: modified id: 20181019T001148Z.73000e76f3a20d599a84ac4362eae58a617e481d log: "Merge conflicts\n" module: src subject: 'CVS commit: src/external/bsd/file' unixtime: '1539907908' user: christos