Public Git Hosting - ljx.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 8d628f7 ce1ad87)

commit	696bc8f86346c16332390165d257db51811f571b
author	Karel Tuma <kat@lua.cz>
	Fri, 3 Jun 2016 18:26:22 +0000 (3 20:26 +0200)
committer	Karel Tuma <kat@lua.cz>
	Fri, 3 Jun 2016 18:26:22 +0000 (3 20:26 +0200)
tree	177006a5cc60c7f3e9fbadbe50b9c7112c77eefa	tree \| snapshot (tar.gz zip)
parent	8d628f7c0071b731fff2320d7bca8e3dbd2ea672	commit \| diff
parent	ce1ad870c3d9536c759ecada89717c3317d56a3d	commit \| diff

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

Signed-off-by: Karel Tuma <kat@lua.cz>

src/Makefile	diff1 \|	diff2 \|	blob \| history
src/Makefile.dep	diff1 \|	diff2 \|	blob \| history
src/lib_aux.c	diff1 \|	diff2 \|	blob \| history
src/lj_arch.h	diff1 \|	diff2 \|	blob \| history
src/lj_asm_x86.h	diff1 \|	diff2 \|	blob \| history
src/lj_record.c	diff1 \|	diff2 \|	blob \| history
src/lj_state.c	diff1 \|	diff2 \|	blob \| history