]> git.ipfire.org Git - thirdparty/LuaJIT.git/commitdiff
Merge branch 'master' into v2.1
authorMike Pall <mike>
Fri, 28 Nov 2014 19:21:35 +0000 (20:21 +0100)
committerMike Pall <mike>
Fri, 28 Nov 2014 19:21:35 +0000 (20:21 +0100)
1  2 
src/lj_asm.c

diff --cc src/lj_asm.c
Simple merge