Merge branch 'master' into v2.1
commit2863b1095699404693a50082dd8d19b6c4cad99f
authorMike Pall <mike>
Thu, 20 Feb 2014 14:09:02 +0000 (20 15:09 +0100)
committerMike Pall <mike>
Thu, 20 Feb 2014 14:09:02 +0000 (20 15:09 +0100)
tree4c4626f4b8a342773fdd961f46eb39dc43616e5e
parent46ce03464b67935fb84ace1d0710a7f3cc62e132
parent998651fcdafc8b6f3d922e1e60864fec83409118
Merge branch 'master' into v2.1
src/lj_asm_arm.h
src/lj_asm_mips.h
src/lj_asm_ppc.h
src/lj_asm_x86.h
src/lj_cparse.c
src/lj_record.c