aboutsummaryrefslogtreecommitdiff
path: root/src/jit/zone.lua
diff options
context:
space:
mode:
authorMike Pall <mike>2016-03-03 12:11:37 +0100
committerMike Pall <mike>2016-03-03 12:11:37 +0100
commitf4231949b5e14e1116452f9e9eea31e19a462c82 (patch)
tree8201252fca8a867ea4d1c33736f1a4dbfd77de6b /src/jit/zone.lua
parent6f3eed9fd8d4f666f21d1e15cdf377a71a3925cf (diff)
parentdb1b399af134e715b8ba9a0e4ad9cbafbe06ecb1 (diff)
downloadluajit-f4231949b5e14e1116452f9e9eea31e19a462c82.tar.gz
luajit-f4231949b5e14e1116452f9e9eea31e19a462c82.tar.bz2
luajit-f4231949b5e14e1116452f9e9eea31e19a462c82.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'src/jit/zone.lua')
-rw-r--r--src/jit/zone.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/jit/zone.lua b/src/jit/zone.lua
index 69f0f169..f5f9656a 100644
--- a/src/jit/zone.lua
+++ b/src/jit/zone.lua
@@ -1,7 +1,7 @@
1---------------------------------------------------------------------------- 1----------------------------------------------------------------------------
2-- LuaJIT profiler zones. 2-- LuaJIT profiler zones.
3-- 3--
4-- Copyright (C) 2005-2015 Mike Pall. All rights reserved. 4-- Copyright (C) 2005-2016 Mike Pall. All rights reserved.
5-- Released under the MIT license. See Copyright Notice in luajit.h 5-- Released under the MIT license. See Copyright Notice in luajit.h
6---------------------------------------------------------------------------- 6----------------------------------------------------------------------------
7-- 7--