Module Name: src
Committed By: christos
Date: Sat Mar 18 15:24:18 UTC 2017
Modified Files:
src/external/bsd/mdocml/dist: Makefile compat_ohash.c configure eqn.c
lib.in libmandoc.h main.c main.h man.c man_hash.c man_macro.c
man_term.c mandoc.h mandoc_aux.h mandocdb.c mansearch.c mdoc_argv.c
mdoc_hash.c mdoc_macro.c mdoc_term.c mdoc_validate.c preconv.c
read.c roff.c roff.h tag.c term.c
src/external/bsd/mdocml/include: config.h
Removed Files:
src/external/bsd/mdocml/dist: compat_sqlite3_errstr.c mansearch_const.c
test-mmap.c test-sqlite3.c test-sqlite3_errstr.c
Log Message:
merge conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/mdocml/dist/Makefile \
src/external/bsd/mdocml/dist/main.c src/external/bsd/mdocml/dist/man.c \
src/external/bsd/mdocml/dist/man_macro.c \
src/external/bsd/mdocml/dist/mansearch.c \
src/external/bsd/mdocml/dist/preconv.c \
src/external/bsd/mdocml/dist/roff.h src/external/bsd/mdocml/dist/term.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/mdocml/dist/compat_ohash.c \
src/external/bsd/mdocml/dist/main.h \
src/external/bsd/mdocml/dist/man_hash.c \
src/external/bsd/mdocml/dist/mandocdb.c \
src/external/bsd/mdocml/dist/mdoc_hash.c \
src/external/bsd/mdocml/dist/mdoc_macro.c
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/mdocml/dist/compat_sqlite3_errstr.c \
src/external/bsd/mdocml/dist/mansearch_const.c \
src/external/bsd/mdocml/dist/test-sqlite3.c \
src/external/bsd/mdocml/dist/test-sqlite3_errstr.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/mdocml/dist/configure \
src/external/bsd/mdocml/dist/mandoc.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/mdocml/dist/eqn.c
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/mdocml/dist/lib.in
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/mdocml/dist/libmandoc.h
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/mdocml/dist/man_term.c \
src/external/bsd/mdocml/dist/mdoc_term.c \
src/external/bsd/mdocml/dist/mdoc_validate.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/mdocml/dist/mandoc_aux.h \
src/external/bsd/mdocml/dist/tag.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/mdocml/dist/mdoc_argv.c
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/mdocml/dist/read.c
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/mdocml/dist/roff.c
cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/mdocml/dist/test-mmap.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/mdocml/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
