]> git.ipfire.org Git - thirdparty/LuaJIT.git/commitdiff
Merge branch 'master' into v2.1
authorMike Pall <mike>
Mon, 12 May 2014 12:36:28 +0000 (14:36 +0200)
committerMike Pall <mike>
Mon, 12 May 2014 12:36:28 +0000 (14:36 +0200)
1  2 
src/lj_err.c

diff --cc src/lj_err.c
Simple merge