Module Name: src
Committed By: christos
Date: Fri May 13 01:52:13 UTC 2011
Modified Files:
src/external/bsd/file/dist: Makefile.am Makefile.in configure
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 diff filesystems os9
src/external/bsd/file/dist/src: apprentice.c cdf.c cdf_time.c
compress.c file.h fsmagic.c funcs.c magic.c readcdf.c readelf.c
softmagic.c
src/external/bsd/file/lib: shlib_version
Removed Files:
src/external/bsd/file/dist: file2netbsd
src/external/bsd/file/dist/magic/magdir: alpha psion
src/external/bsd/file/dist/python: py_magic.c py_magic.h
src/external/bsd/file/dist/src: patchlevel.h
Log Message:
resolve conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/file/dist/Makefile.am \
src/external/bsd/file/dist/Makefile.in \
src/external/bsd/file/dist/configure
cvs rdiff -u -r1.2 -r0 src/external/bsd/file/dist/file2netbsd
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/dist/doc/file.1 \
src/external/bsd/file/dist/doc/libmagic.3
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/doc/magic.5
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/file/dist/magic/Makefile.am \
src/external/bsd/file/dist/magic/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/file/dist/magic/magdir/alpha \
src/external/bsd/file/dist/magic/magdir/psion
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/file/dist/magic/magdir/archive \
src/external/bsd/file/dist/magic/magdir/diff \
src/external/bsd/file/dist/magic/magdir/os9
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/dist/magic/magdir/filesystems
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/file/dist/python/py_magic.c \
src/external/bsd/file/dist/python/py_magic.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/file/dist/src/apprentice.c \
src/external/bsd/file/dist/src/cdf_time.c \
src/external/bsd/file/dist/src/compress.c \
src/external/bsd/file/dist/src/fsmagic.c \
src/external/bsd/file/dist/src/funcs.c \
src/external/bsd/file/dist/src/magic.c \
src/external/bsd/file/dist/src/readcdf.c \
src/external/bsd/file/dist/src/readelf.c \
src/external/bsd/file/dist/src/softmagic.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/dist/src/cdf.c \
src/external/bsd/file/dist/src/file.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/file/dist/src/patchlevel.h
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/file/lib/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
