Module Name: src
Committed By: christos
Date: Thu Dec 17 22:31:01 UTC 2015
Modified Files:
src/external/bsd/mdocml: Makefile.inc prepare-import.sh
src/external/bsd/mdocml/bin/mandoc: Makefile
src/external/bsd/mdocml/lib/libmandoc: Makefile
Added Files:
src/external/bsd/mdocml/include: config.h
Log Message:
merge conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/mdocml/Makefile.inc
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/mdocml/prepare-import.sh
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/mdocml/bin/mandoc/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/mdocml/include/config.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/mdocml/lib/libmandoc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
