CVS commit: src/external/mit/lua/dist/doc

["Marc Balmer" <mbalmer%netbsd.org@localhost>]

Module Name:    src
Committed By:   mbalmer
Date:           Wed Apr 26 12:36:53 UTC 2017

Modified Files:
        src/external/mit/lua/dist/doc: contents.html lua.1 luac.1 manual.html
            readme.html

Log Message:
after-import fixes, conflict resolution


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/lua/dist/doc/contents.html \
    src/external/mit/lua/dist/doc/lua.1 \
    src/external/mit/lua/dist/doc/readme.html
cvs rdiff -u -r1.4 -r1.5 src/external/mit/lua/dist/doc/luac.1
cvs rdiff -u -r1.6 -r1.7 src/external/mit/lua/dist/doc/manual.html

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.