diff options
| author | Mike Pall <mike> | 2022-01-15 19:42:30 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2022-01-15 19:42:30 +0100 |
| commit | 7306ba78d62b55a64f25231df1d5697345a5572e (patch) | |
| tree | b20514c4469babd1cbd80a52a8251387153e278c /src/lj_obj.h | |
| parent | c21c6cb4170159250aa778ec888db7f919dfb0e9 (diff) | |
| parent | c4dfb625bad8937d72074852a977738ec3eb1ab7 (diff) | |
| download | luajit-7306ba78d62b55a64f25231df1d5697345a5572e.tar.gz luajit-7306ba78d62b55a64f25231df1d5697345a5572e.tar.bz2 luajit-7306ba78d62b55a64f25231df1d5697345a5572e.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_obj.h')
| -rw-r--r-- | src/lj_obj.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_obj.h b/src/lj_obj.h index 1a6445fc..0a63fddf 100644 --- a/src/lj_obj.h +++ b/src/lj_obj.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** LuaJIT VM tags, values and objects. | 2 | ** LuaJIT VM tags, values and objects. |
| 3 | ** Copyright (C) 2005-2021 Mike Pall. See Copyright Notice in luajit.h | 3 | ** Copyright (C) 2005-2022 Mike Pall. See Copyright Notice in luajit.h |
| 4 | ** | 4 | ** |
| 5 | ** Portions taken verbatim or adapted from the Lua interpreter. | 5 | ** Portions taken verbatim or adapted from the Lua interpreter. |
| 6 | ** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h | 6 | ** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h |