Public Git Hosting - ljx.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: a4e52af 287a534)

commit	e7b3629cdd5ecee8f88f155fc029471abb1fbefa
author	Karel Tuma <kat@lua.cz>
	Mon, 20 Jun 2016 14:16:56 +0000 (20 16:16 +0200)
committer	Karel Tuma <kat@lua.cz>
	Mon, 20 Jun 2016 14:16:56 +0000 (20 16:16 +0200)
tree	8662eeb26622f4844ecf8d779e1c2d8cc54f7f13	tree \| snapshot (tar.gz zip)
parent	a4e52af34c8212672963da1789e44a49ca004e7d	commit \| diff
parent	287a5347cfe452d44748327fb7c27f6ce57f5dc2	commit \| diff

Merge branch 'v2.1' of luajit.org/git/luajit-2.0

src/lib_jit.c	diff1 \|	diff2 \|	blob \| history
src/lj_asm_x86.h	diff1 \|	diff2 \|	blob \| history