diff options
author | Mike Pall <mike> | 2015-01-06 00:12:45 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2015-01-06 00:12:45 +0100 |
commit | 0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535 (patch) | |
tree | 79adfce53c856e0b066683352fd95cb40c97b3c5 /src/lj_tab.c | |
parent | c71cdf4c36145dd052734779d297fdbd7455468f (diff) | |
parent | 86913b9bbf75c78a5dcfa2bf6071db8db7df7c51 (diff) | |
download | luajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.tar.gz luajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.tar.bz2 luajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.zip |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_tab.c')
-rw-r--r-- | src/lj_tab.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_tab.c b/src/lj_tab.c index b6bb7805..a9f43835 100644 --- a/src/lj_tab.c +++ b/src/lj_tab.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | ** Table handling. | 2 | ** Table handling. |
3 | ** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h | 3 | ** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h |
4 | ** | 4 | ** |
5 | ** Major portions taken verbatim or adapted from the Lua interpreter. | 5 | ** Major 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 |