summaryrefslogtreecommitdiff
path: root/external/mit/lua/dist/src/loadlib.c
diff options
context:
space:
mode:
authoralnsn <alnsn@NetBSD.org>2018-08-04 17:30:01 +0000
committeralnsn <alnsn@NetBSD.org>2018-08-04 17:30:01 +0000
commit3759ec8accd3a9c6a366fe711feeda9574464ada (patch)
tree1204eb9c92f8c012c3793806232b6501dc4c2e47 /external/mit/lua/dist/src/loadlib.c
parentf24b54d3a35ec193641f87f0c2dc7c67a0fb4f3e (diff)
Resolve conflicts.
Diffstat (limited to 'external/mit/lua/dist/src/loadlib.c')
-rw-r--r--external/mit/lua/dist/src/loadlib.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/external/mit/lua/dist/src/loadlib.c b/external/mit/lua/dist/src/loadlib.c
index 632cc019c91..b19f5293d6c 100644
--- a/external/mit/lua/dist/src/loadlib.c
+++ b/external/mit/lua/dist/src/loadlib.c
@@ -1,7 +1,7 @@
-/* $NetBSD: loadlib.c,v 1.8 2017/04/26 13:17:33 mbalmer Exp $ */
+/* $NetBSD: loadlib.c,v 1.9 2018/08/04 17:30:01 alnsn Exp $ */
/*
-** Id: loadlib.c,v 1.130 2017/01/12 17:14:26 roberto Exp
+** Id: loadlib.c,v 1.130.1.1 2017/04/19 17:20:42 roberto Exp
** Dynamic library loader for Lua
** See Copyright Notice in lua.h
**