Module Name: src
Committed By: christos
Date: Wed Feb 22 17:53:52 UTC 2012
Modified Files:
src/external/bsd/file/dist: configure configure.ac install-sh
src/external/bsd/file/dist/doc: file.1 libmagic.3 magic.5
src/external/bsd/file/dist/magic: Makefile.am Makefile.in
src/external/bsd/file/dist/magic/magdir: archive
src/external/bsd/file/dist/src: Makefile.in apprentice.c cdf.c
cdf_time.c compress.c file.h funcs.c print.c readcdf.c softmagic.c
Removed Files:
src/external/bsd/file/dist/src: names.h
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/configure
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/dist/configure.ac
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/install-sh
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/doc/file.1
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/doc/libmagic.3
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/doc/magic.5
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/magic/Makefile.am
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/magic/Makefile.in
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/dist/magic/magdir/archive
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/src/Makefile.in \
src/external/bsd/file/dist/src/compress.c \
src/external/bsd/file/dist/src/softmagic.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/dist/src/apprentice.c \
src/external/bsd/file/dist/src/cdf.c \
src/external/bsd/file/dist/src/file.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/dist/src/cdf_time.c \
src/external/bsd/file/dist/src/funcs.c \
src/external/bsd/file/dist/src/print.c
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/file/dist/src/names.h
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/src/readcdf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
