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.
Modified files:
Index: src/external/mit/lua/dist/Makefile
diff -u src/external/mit/lua/dist/Makefile:1.3 src/external/mit/lua/dist/Makefile:1.4
--- src/external/mit/lua/dist/Makefile:1.3 Mon Feb 2 14:03:05 2015
+++ src/external/mit/lua/dist/Makefile Thu Oct 8 12:42:30 2015
@@ -46,7 +46,7 @@ TO_MAN= lua.1 luac.1
# Lua version and release.
V= 5.3
-R= $V.0
+R= $V.1
# Targets start here.
all: $(PLAT)
Index: src/external/mit/lua/dist/README
diff -u src/external/mit/lua/dist/README:1.3 src/external/mit/lua/dist/README:1.4
--- src/external/mit/lua/dist/README:1.3 Mon Feb 2 14:03:05 2015
+++ src/external/mit/lua/dist/README Thu Oct 8 12:42:30 2015
@@ -1,5 +1,5 @@
-This is Lua 5.3.0, released on 06 Jan 2015.
+This is Lua 5.3.1, released on 10 Jun 2015.
For installation instructions, license details, and
further information about Lua, see doc/readme.html.
