Merge branch 'vendor/MDOCML'
authorFranco Fichtner <franco@lastsummer.de>
Tue, 31 Dec 2013 13:38:23 +0000 (14:38 +0100)
committerFranco Fichtner <franco@lastsummer.de>
Tue, 31 Dec 2013 13:38:23 +0000 (14:38 +0100)
Conflicts:
contrib/mdocml/index.sgml
contrib/mdocml/lib.in
contrib/mdocml/mandoc.3
contrib/mdocml/mandoc.c
contrib/mdocml/mandoc.h
contrib/mdocml/mdoc.7
contrib/mdocml/roff.c

1  2 
contrib/mdocml/Makefile
contrib/mdocml/lib.in
contrib/mdocml/mandoc.c
contrib/mdocml/mandoc.h

Simple merge
Simple merge
Simple merge
Simple merge