Module Name: src Committed By: mbalmer Date: Thu Oct 8 12:42:30 UTC 2015
Modified Files:
src/external/mit/lua/dist: Makefile README
Log Message:
Resolve conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/lua/dist/Makefile \
src/external/mit/lua/dist/README
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
