aboutsummaryrefslogtreecommitdiff
path: root/src/lj_tab.c
diff options
context:
space:
mode:
authorMike Pall <mike>2017-01-17 12:41:05 +0100
committerMike Pall <mike>2017-01-17 12:41:05 +0100
commit71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd (patch)
tree898e706d4b2455c2c3799cc179f3bc7adf096858 /src/lj_tab.c
parentc94b921f924c1b37fea52e34f4e01ba8b37d77d0 (diff)
parentb93a1dd0c831cab22f98163d0dde792a493c0eef (diff)
downloadluajit-71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd.tar.gz
luajit-71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd.tar.bz2
luajit-71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_tab.c')
-rw-r--r--src/lj_tab.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_tab.c b/src/lj_tab.c
index 71be0a90..47c0cfd3 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-2016 Mike Pall. See Copyright Notice in luajit.h 3** Copyright (C) 2005-2017 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