Module Name: src
Committed By: alnsn
Date: Sat Aug 4 17:30:01 UTC 2018
Modified Files:
src/external/mit/lua/dist: README
src/external/mit/lua/dist/doc: contents.html lua.css manual.html
readme.html
src/external/mit/lua/dist/src: Makefile lapi.c lapi.h lauxlib.c
lauxlib.h lbaselib.c lbitlib.c lcode.c lcode.h lcorolib.c lctype.c
lctype.h ldblib.c ldebug.c ldebug.h ldo.c ldo.h ldump.c lfunc.c
lfunc.h lgc.c lgc.h linit.c liolib.c llex.c llex.h llimits.h
lmathlib.c lmem.c lmem.h loadlib.c lobject.c lobject.h lopcodes.c
lopcodes.h loslib.c lparser.c lparser.h lprefix.h lstate.c lstate.h
lstring.c lstring.h lstrlib.c ltable.c ltable.h ltablib.c ltm.c
ltm.h lua.c lua.h luac.c luaconf.h lualib.h lundump.c lundump.h
lutf8lib.c lvm.c lvm.h lzio.c lzio.h
Log Message:
Resolve conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/lua/dist/README
cvs rdiff -u -r1.6 -r1.7 src/external/mit/lua/dist/doc/contents.html \
src/external/mit/lua/dist/doc/lua.css \
src/external/mit/lua/dist/doc/readme.html
cvs rdiff -u -r1.7 -r1.8 src/external/mit/lua/dist/doc/manual.html
cvs rdiff -u -r1.4 -r1.5 src/external/mit/lua/dist/src/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/mit/lua/dist/src/lapi.c \
src/external/mit/lua/dist/src/lauxlib.c \
src/external/mit/lua/dist/src/lcode.c \
src/external/mit/lua/dist/src/ldblib.c \
src/external/mit/lua/dist/src/ldebug.c \
src/external/mit/lua/dist/src/loslib.c \
src/external/mit/lua/dist/src/lparser.c \
src/external/mit/lua/dist/src/ltable.c \
src/external/mit/lua/dist/src/lua.h
cvs rdiff -u -r1.8 -r1.9 src/external/mit/lua/dist/src/lapi.h \
src/external/mit/lua/dist/src/ldebug.h \
src/external/mit/lua/dist/src/ldo.c src/external/mit/lua/dist/src/ldo.h \
src/external/mit/lua/dist/src/ldump.c \
src/external/mit/lua/dist/src/linit.c \
src/external/mit/lua/dist/src/liolib.c \
src/external/mit/lua/dist/src/lmathlib.c \
src/external/mit/lua/dist/src/lmem.c \
src/external/mit/lua/dist/src/loadlib.c \
src/external/mit/lua/dist/src/lstate.c \
src/external/mit/lua/dist/src/lstate.h \
src/external/mit/lua/dist/src/lstring.c \
src/external/mit/lua/dist/src/lstring.h \
src/external/mit/lua/dist/src/ltablib.c \
src/external/mit/lua/dist/src/ltm.c src/external/mit/lua/dist/src/lua.c
cvs rdiff -u -r1.7 -r1.8 src/external/mit/lua/dist/src/lauxlib.h \
src/external/mit/lua/dist/src/lcode.h \
src/external/mit/lua/dist/src/lfunc.c \
src/external/mit/lua/dist/src/lfunc.h src/external/mit/lua/dist/src/lgc.h \
src/external/mit/lua/dist/src/llex.h src/external/mit/lua/dist/src/lmem.h \
src/external/mit/lua/dist/src/lopcodes.c \
src/external/mit/lua/dist/src/lopcodes.h \
src/external/mit/lua/dist/src/lparser.h \
src/external/mit/lua/dist/src/ltable.h \
src/external/mit/lua/dist/src/ltm.h \
src/external/mit/lua/dist/src/lundump.c \
src/external/mit/lua/dist/src/lutf8lib.c \
src/external/mit/lua/dist/src/lzio.c src/external/mit/lua/dist/src/lzio.h
cvs rdiff -u -r1.9 -r1.10 src/external/mit/lua/dist/src/lbaselib.c \
src/external/mit/lua/dist/src/lgc.c \
src/external/mit/lua/dist/src/llimits.h \
src/external/mit/lua/dist/src/lobject.h \
src/external/mit/lua/dist/src/luac.c src/external/mit/lua/dist/src/lvm.h
cvs rdiff -u -r1.6 -r1.7 src/external/mit/lua/dist/src/lbitlib.c \
src/external/mit/lua/dist/src/lcorolib.c \
src/external/mit/lua/dist/src/lctype.c \
src/external/mit/lua/dist/src/lctype.h \
src/external/mit/lua/dist/src/lprefix.h \
src/external/mit/lua/dist/src/lualib.h \
src/external/mit/lua/dist/src/lundump.h
cvs rdiff -u -r1.11 -r1.12 src/external/mit/lua/dist/src/llex.c \
src/external/mit/lua/dist/src/lobject.c
cvs rdiff -u -r1.17 -r1.18 src/external/mit/lua/dist/src/lstrlib.c
cvs rdiff -u -r1.22 -r1.23 src/external/mit/lua/dist/src/luaconf.h
cvs rdiff -u -r1.13 -r1.14 src/external/mit/lua/dist/src/lvm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
