Module Name: src Committed By: alnsn Date: Thu Mar 15 00:17:22 UTC 2012
Modified Files:
src/external/mit/lua/dist/src: luaconf.h
Log Message:
Resolve conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/lua/dist/src/luaconf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
