Merge branch 'master' into v2.1
commit9695c5ab46b4621a453839b196bd07421f5300da
authorMike Pall <mike>
Wed, 26 Feb 2014 14:57:13 +0000 (26 15:57 +0100)
committerMike Pall <mike>
Wed, 26 Feb 2014 14:57:13 +0000 (26 15:57 +0100)
tree607900a3dabba6ad88f80f2eb627f5f903282482
parent2863b1095699404693a50082dd8d19b6c4cad99f
parent6a47e123a4339e33a7942525a19348cd2068b057
Merge branch 'master' into v2.1
doc/install.html
doc/luajit.html
src/lib_io.c
src/lib_os.c
src/lj_arch.h