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

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

Module Name:    src
Committed By:   mbalmer
Date:           Thu Oct  8 12:40:05 UTC 2015

Modified Files:
        src/external/mit/lua/dist/src: ldblib.c

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/lua/dist/src/ldblib.c

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