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.c | |
| parent | f24b54d3a35ec193641f87f0c2dc7c67a0fb4f3e (diff) | |
Resolve conflicts.
Diffstat (limited to 'external/mit/lua/dist/src/lua.c')
| -rw-r--r-- | external/mit/lua/dist/src/lua.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/external/mit/lua/dist/src/lua.c b/external/mit/lua/dist/src/lua.c index 0a7f6bb3750..145aeb4ba55 100644 --- a/external/mit/lua/dist/src/lua.c +++ b/external/mit/lua/dist/src/lua.c @@ -1,7 +1,7 @@ -/* $NetBSD: lua.c,v 1.8 2017/04/26 13:17:33 mbalmer Exp $ */ +/* $NetBSD: lua.c,v 1.9 2018/08/04 17:30:01 alnsn Exp $ */ /* -** Id: lua.c,v 1.230 2017/01/12 17:14:26 roberto Exp +** Id: lua.c,v 1.230.1.1 2017/04/19 17:29:57 roberto Exp ** Lua stand-alone interpreter ** See Copyright Notice in lua.h */ @@ -140,7 +140,7 @@ static void print_usage (const char *badoption) { "Available options are:\n" " -e stat execute string 'stat'\n" " -i enter interactive mode after executing 'script'\n" - " -l name require library 'name'\n" + " -l name require library 'name' into global 'name'\n" " -v show version information\n" " -E ignore environment variables\n" " -- stop handling options\n" |
