Module Name: src
Committed By: christos
Date: Fri Jul 15 19:40:42 UTC 2016
Modified Files:
src/external/bsd/mdocml/bin/mandoc: Makefile
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_term.c mdoc_validate.c msec.in preconv.c read.c
roff.c st.in tbl.c tbl_data.c tbl_layout.c tbl_opts.c term.c
src/external/bsd/mdocml/include: config.h
src/external/bsd/mdocml/lib/libmandoc: Makefile
src/external/bsd/mdocml/man: Makefile
Added Files:
src/external/bsd/mdocml/dist: roff.h
Removed Files:
src/external/bsd/mdocml/dist: chars.in compat_fgetln.c
example.style.css man-cgi.css manpath.h test-fgetln.c
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/mdocml/bin/mandoc/Makefile
cvs rdiff -u -r1.2 -r1.3 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/mandoc_aux.h \
src/external/bsd/mdocml/dist/mansearch.c \
src/external/bsd/mdocml/dist/preconv.c \
src/external/bsd/mdocml/dist/term.c
cvs rdiff -u -r1.1.1.13 -r0 src/external/bsd/mdocml/dist/chars.in
cvs rdiff -u -r1.4 -r0 src/external/bsd/mdocml/dist/compat_fgetln.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/mdocml/dist/compat_ohash.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/mdocml/dist/configure \
src/external/bsd/mdocml/dist/eqn.c src/external/bsd/mdocml/dist/st.in
cvs rdiff -u -r1.1.1.6 -r0 src/external/bsd/mdocml/dist/example.style.css
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/mdocml/dist/lib.in
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/mdocml/dist/libmandoc.h \
src/external/bsd/mdocml/dist/tbl.c \
src/external/bsd/mdocml/dist/tbl_data.c \
src/external/bsd/mdocml/dist/tbl_opts.c
cvs rdiff -u -r1.1.1.12 -r1.2 src/external/bsd/mdocml/dist/main.h
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/mdocml/dist/man-cgi.css \
src/external/bsd/mdocml/dist/test-fgetln.c
cvs rdiff -u -r1.1.1.11 -r1.2 src/external/bsd/mdocml/dist/man_hash.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/mdocml/dist/man_term.c \
src/external/bsd/mdocml/dist/mdoc_term.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/mdocml/dist/mandoc.h \
src/external/bsd/mdocml/dist/msec.in
cvs rdiff -u -r1.1.1.6 -r1.2 src/external/bsd/mdocml/dist/mandocdb.c
cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/mdocml/dist/manpath.h
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/mdocml/dist/mdoc_argv.c \
src/external/bsd/mdocml/dist/tbl_layout.c
cvs rdiff -u -r1.1.1.10 -r1.2 src/external/bsd/mdocml/dist/mdoc_hash.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/mdocml/dist/mdoc_validate.c
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/mdocml/dist/read.c
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/mdocml/dist/roff.c
cvs rdiff -u -r0 -r1.3 src/external/bsd/mdocml/dist/roff.h
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/mdocml/include/config.h
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/mdocml/lib/libmandoc/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/mdocml/man/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
