Merge branch 'master' into v2.1
commit647cc4613f3acd5ec8785920102af22b85cf2b9c
authorMike Pall <mike>
Thu, 16 May 2013 18:07:53 +0000 (16 20:07 +0200)
committerMike Pall <mike>
Thu, 16 May 2013 18:07:53 +0000 (16 20:07 +0200)
treee73f6e3ef1201884eb4be43097c51e1df80d9a7f
parenta946f678d553494ee23a29a10cced1d5cc11ab7e
parent0f79d4741f29637de1eaaa603fdd0d161feb390d
Merge branch 'master' into v2.1
src/lj_asm.c
src/lj_asm_arm.h
src/lj_asm_mips.h
src/lj_asm_ppc.h
src/lj_asm_x86.h