summaryrefslogtreecommitdiff
path: root/external/mit
diff options
context:
space:
mode:
authormbalmer <mbalmer@NetBSD.org>2017-04-26 13:00:46 +0000
committermbalmer <mbalmer@NetBSD.org>2017-04-26 13:00:46 +0000
commit034e5ddb0c1e167fec5bce47ef3e7b6edd725f45 (patch)
treed0c857b92d1bd9bf56c733d3843d615acf2410bf /external/mit
parent16f38927afaf9f7b40a817d2e5759f8bf8770c82 (diff)
fix import conflicts
Diffstat (limited to 'external/mit')
-rw-r--r--external/mit/lua/dist/Makefile2
-rw-r--r--external/mit/lua/dist/README2
-rw-r--r--external/mit/lua/dist/doc/lua.12
-rw-r--r--external/mit/lua/dist/doc/luac.12
4 files changed, 4 insertions, 4 deletions
diff --git a/external/mit/lua/dist/Makefile b/external/mit/lua/dist/Makefile
index c795dd7930a..119110d2f01 100644
--- a/external/mit/lua/dist/Makefile
+++ b/external/mit/lua/dist/Makefile
@@ -46,7 +46,7 @@ TO_MAN= lua.1 luac.1
# Lua version and release.
V= 5.3
-R= $V.3
+R= $V.4
# Targets start here.
all: $(PLAT)
diff --git a/external/mit/lua/dist/README b/external/mit/lua/dist/README
index e84d9acb898..0b31908a06c 100644
--- a/external/mit/lua/dist/README
+++ b/external/mit/lua/dist/README
@@ -1,5 +1,5 @@
-This is Lua 5.3.3, released on 30 May 2016.
+This is Lua 5.3.4, released on 12 Jan 2017.
For installation instructions, license details, and
further information about Lua, see doc/readme.html.
diff --git a/external/mit/lua/dist/doc/lua.1 b/external/mit/lua/dist/doc/lua.1
index 8b0d29b5c00..88313a855d1 100644
--- a/external/mit/lua/dist/doc/lua.1
+++ b/external/mit/lua/dist/doc/lua.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: lua.1,v 1.6 2017/04/26 12:36:53 mbalmer Exp $
+.\" $NetBSD: lua.1,v 1.7 2017/04/26 13:00:46 mbalmer Exp $
.\"
.\" Id: lua.man,v 1.14 2016/10/17 15:43:50 lhf Exp
.TH LUA 1 "Date: 2016/10/17 15:43:50 "
diff --git a/external/mit/lua/dist/doc/luac.1 b/external/mit/lua/dist/doc/luac.1
index 3341f684f89..42722018239 100644
--- a/external/mit/lua/dist/doc/luac.1
+++ b/external/mit/lua/dist/doc/luac.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: luac.1,v 1.5 2017/04/26 12:36:53 mbalmer Exp $
+.\" $NetBSD: luac.1,v 1.6 2017/04/26 13:00:46 mbalmer Exp $
.\"
.\" Id: luac.man,v 1.29 2011/11/16 13:53:40 lhf Exp
.TH LUAC 1 "Date: 2011/11/16 13:53:40 "