summaryrefslogtreecommitdiff
path: root/external/mit/lua/dist/src/lcode.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/lcode.c
parentf24b54d3a35ec193641f87f0c2dc7c67a0fb4f3e (diff)
Resolve conflicts.
Diffstat (limited to 'external/mit/lua/dist/src/lcode.c')
-rw-r--r--external/mit/lua/dist/src/lcode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/external/mit/lua/dist/src/lcode.c b/external/mit/lua/dist/src/lcode.c
index b25972cdc40..8c83decf490 100644
--- a/external/mit/lua/dist/src/lcode.c
+++ b/external/mit/lua/dist/src/lcode.c
@@ -1,7 +1,7 @@
-/* $NetBSD: lcode.c,v 1.10 2017/04/26 13:17:33 mbalmer Exp $ */
+/* $NetBSD: lcode.c,v 1.11 2018/08/04 17:30:01 alnsn Exp $ */
/*
-** Id: lcode.c,v 2.112 2016/12/22 13:08:50 roberto Exp
+** Id: lcode.c,v 2.112.1.1 2017/04/19 17:20:42 roberto Exp
** Code generator for Lua
** See Copyright Notice in lua.h
*/
tos 2002-11-15PR/18995: David Laight: libedit fixes for posix conformant shchristos 2002-10-27vi mode and memory fixes from david laight.christos 2002-03-18- constify; passes all gcc and lint strict checks.christos 2002-02-03Fixed an __P remnantchristos 2001-01-10Enlarge editline buffers as needed to support arbitrary length lines.jdolecek 2000-09-04convert to new style guide, which includes:lukem 1999-07-02More trailing white space.simonb 1998-12-12delintchristos