Module Name: src
Committed By: christos
Date: Thu Dec 17 22:31:12 UTC 2015
Modified Files:
src/external/bsd/mdocml/dist: Makefile compat_fgetln.c configure lib.in
libmandoc.h man.c man_term.c mandoc.h mansearch.c mdoc_argv.c
mdoc_term.c mdoc_validate.c msec.in read.c roff.c st.in tbl.c
tbl_data.c tbl_layout.c tbl_opts.c
Removed Files:
src/external/bsd/mdocml/dist: apropos.c arch.c arch.in att.in
compat_strnlen.c config.h.post config.h.pre external.png.uu
man.cgi.7 mandocdb.8 preconv.1 test-strnlen.c vol.c vol.in
Log Message:
merge conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.15 -r1.2 src/external/bsd/mdocml/dist/Makefile \
src/external/bsd/mdocml/dist/man.c
cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/mdocml/dist/apropos.c \
src/external/bsd/mdocml/dist/att.in \
src/external/bsd/mdocml/dist/config.h.post
cvs rdiff -u -r1.1.1.7 -r0 src/external/bsd/mdocml/dist/arch.c \
src/external/bsd/mdocml/dist/vol.c
cvs rdiff -u -r1.5 -r0 src/external/bsd/mdocml/dist/arch.in
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/mdocml/dist/compat_fgetln.c \
src/external/bsd/mdocml/dist/mandoc.h src/external/bsd/mdocml/dist/st.in
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/mdocml/dist/compat_strnlen.c \
src/external/bsd/mdocml/dist/test-strnlen.c
cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/mdocml/dist/config.h.pre \
src/external/bsd/mdocml/dist/external.png.uu \
src/external/bsd/mdocml/dist/man.cgi.7 \
src/external/bsd/mdocml/dist/mandocdb.8 \
src/external/bsd/mdocml/dist/preconv.1 \
src/external/bsd/mdocml/dist/vol.in
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/mdocml/dist/configure \
src/external/bsd/mdocml/dist/mansearch.c
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/mdocml/dist/lib.in
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/mdocml/dist/libmandoc.h \
src/external/bsd/mdocml/dist/msec.in
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/mdocml/dist/man_term.c \
src/external/bsd/mdocml/dist/mdoc_term.c \
src/external/bsd/mdocml/dist/read.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/mdocml/dist/mdoc_argv.c \
src/external/bsd/mdocml/dist/mdoc_validate.c \
src/external/bsd/mdocml/dist/tbl_layout.c
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/mdocml/dist/roff.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/mdocml/dist/tbl.c \
src/external/bsd/mdocml/dist/tbl_data.c \
src/external/bsd/mdocml/dist/tbl_opts.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
