Module Name: src
Committed By: christos
Date: Mon Mar 11 00:15:39 UTC 2019
Modified Files:
src/external/bsd/mdocml: Makefile.inc
src/external/bsd/mdocml/dist: Makefile configure eqn.c lib.in
libmandoc.h main.c main.h man.c man_macro.c man_term.c mandoc.h
mandocdb.c mansearch.c mdoc.7 mdoc_argv.c mdoc_macro.c mdoc_term.c
mdoc_validate.c out.c preconv.c read.c roff.c roff.h tag.c tbl.c
tbl_data.c tbl_html.c tbl_layout.c tbl_opts.c term.c term_ascii.c
src/external/bsd/mdocml/include: config.h
src/external/bsd/mdocml/lib/libmandoc: Makefile
Added Files:
src/external/bsd/mdocml/dist: arch.c
Removed Files:
src/external/bsd/mdocml/dist: libroff.h st.in
Log Message:
resolve conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/mdocml/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 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/roff.h src/external/bsd/mdocml/dist/term.c
cvs rdiff -u -r0 -r1.3 src/external/bsd/mdocml/dist/arch.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/mdocml/dist/configure
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/mdocml/dist/eqn.c \
src/external/bsd/mdocml/dist/tbl_opts.c
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/mdocml/dist/lib.in
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/mdocml/dist/libmandoc.h \
src/external/bsd/mdocml/dist/tbl_layout.c
cvs rdiff -u -r1.1.1.7 -r0 src/external/bsd/mdocml/dist/libroff.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/mdocml/dist/main.h \
src/external/bsd/mdocml/dist/mandocdb.c \
src/external/bsd/mdocml/dist/mdoc.7 \
src/external/bsd/mdocml/dist/mdoc_macro.c \
src/external/bsd/mdocml/dist/preconv.c
cvs rdiff -u -r1.14 -r1.15 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.8 -r1.9 src/external/bsd/mdocml/dist/mandoc.h \
src/external/bsd/mdocml/dist/tbl.c \
src/external/bsd/mdocml/dist/tbl_data.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/mdocml/dist/mdoc_argv.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/mdocml/dist/out.c
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/mdocml/dist/read.c
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/mdocml/dist/roff.c
cvs rdiff -u -r1.8 -r0 src/external/bsd/mdocml/dist/st.in
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/mdocml/dist/tag.c
cvs rdiff -u -r1.1.1.9 -r1.2 src/external/bsd/mdocml/dist/tbl_html.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/mdocml/dist/term_ascii.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/mdocml/include/config.h
cvs rdiff -u -r1.11 -r1.12 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.
