diff options
| author | alnsn <alnsn@NetBSD.org> | 2018-08-04 17:30:01 +0000 |
|---|---|---|
| committer | alnsn <alnsn@NetBSD.org> | 2018-08-04 17:30:01 +0000 |
| commit | 3759ec8accd3a9c6a366fe711feeda9574464ada (patch) | |
| tree | 1204eb9c92f8c012c3793806232b6501dc4c2e47 /external/mit/lua/dist/src/lua.h | |
| parent | f24b54d3a35ec193641f87f0c2dc7c67a0fb4f3e (diff) | |
Resolve conflicts.
Diffstat (limited to 'external/mit/lua/dist/src/lua.h')
| -rw-r--r-- | external/mit/lua/dist/src/lua.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/external/mit/lua/dist/src/lua.h b/external/mit/lua/dist/src/lua.h index 6dcbbcbc7f8..43749930ce0 100644 --- a/external/mit/lua/dist/src/lua.h +++ b/external/mit/lua/dist/src/lua.h @@ -1,7 +1,7 @@ -/* $NetBSD: lua.h,v 1.10 2017/05/20 10:12:29 mbalmer Exp $ */ +/* $NetBSD: lua.h,v 1.11 2018/08/04 17:30:01 alnsn Exp $ */ /* -** Id: lua.h,v 1.332 2016/12/22 15:51:20 roberto Exp +** Id: lua.h,v 1.332.1.2 2018/06/13 16:58:17 roberto Exp ** Lua - A Scripting Language ** Lua.org, PUC-Rio, Brazil (http://www.lua.org) ** See Copyright Notice at the end of this file @@ -23,11 +23,11 @@ #define LUA_VERSION_MAJOR "5" #define LUA_VERSION_MINOR "3" #define LUA_VERSION_NUM 503 -#define LUA_VERSION_RELEASE "4" +#define LUA_VERSION_RELEASE "5" #define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR #define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE -#define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2017 Lua.org, PUC-Rio" +#define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2018 Lua.org, PUC-Rio" #define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo, W. Celes" @@ -486,7 +486,7 @@ struct lua_Debug { #ifdef _KERNEL * Copyright (c) 2016-2017, Lourival Vieira Neto <lneto@NetBSD.org>. #endif -* Copyright (C) 1994-2017 Lua.org, PUC-Rio. +* Copyright (C) 1994-2018 Lua.org, PUC-Rio. * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the |
