Module Name: src
Committed By: christos
Date: Sun Dec 1 19:32:15 UTC 2013
Modified Files:
src/external/bsd/file/dist: Makefile.in aclocal.m4 compile config.h.in
configure configure.ac depcomp install-sh missing
src/external/bsd/file/dist/doc: Makefile.in file.1 magic.5
src/external/bsd/file/dist/magic: Makefile.am Makefile.in
src/external/bsd/file/dist/magic/magdir: assembler elf filesystems
src/external/bsd/file/dist/python: Makefile.in
src/external/bsd/file/dist/src: Makefile.in apprentice.c compress.c
file.h fsmagic.c funcs.c magic.c readcdf.c readelf.c softmagic.c
src/external/bsd/file/dist/tests: Makefile.in
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/Makefile.in
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/aclocal.m4 \
src/external/bsd/file/dist/config.h.in \
src/external/bsd/file/dist/configure.ac
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/dist/compile
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/configure
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/dist/depcomp \
src/external/bsd/file/dist/missing
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/file/dist/install-sh
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/doc/Makefile.in
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/dist/doc/file.1
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/file/dist/doc/magic.5
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/file/dist/magic/Makefile.am
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/magic/Makefile.in
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/dist/magic/magdir/assembler
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/file/dist/magic/magdir/elf
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/magic/magdir/filesystems
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/python/Makefile.in
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/file/dist/src/Makefile.in \
src/external/bsd/file/dist/src/compress.c \
src/external/bsd/file/dist/src/fsmagic.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/src/apprentice.c \
src/external/bsd/file/dist/src/softmagic.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/src/file.h \
src/external/bsd/file/dist/src/readcdf.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/dist/src/funcs.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/src/magic.c \
src/external/bsd/file/dist/src/readelf.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/tests/Makefile.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
