Merge branch 'rr1-maint'
commit59ef6961e398c1af1ebbb47222ffd2c1b7aff727
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Fri, 27 Sep 2013 07:47:19 +0000 (27 10:47 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Fri, 27 Sep 2013 07:47:19 +0000 (27 10:47 +0300)
tree9e807b60ca9e86f94b3b09dee238a04b839efda0
parent22cba85a37d29d4cb466de8cbb5f9617be518678
parenta42c0bf6eac940a67c2c2073dad827407e3baf3b
Merge branch 'rr1-maint'
16 files changed:
include/library/commands.hpp
include/library/framebuffer.hpp
include/library/luabase.hpp
include/lua/bitmap.hpp
include/lua/unsaferewind.hpp
src/library/luabase.cpp
src/lua/callback.cpp
src/lua/core.cpp
src/lua/gui-bitmap.cpp
src/lua/gui-rqueue.cpp
src/lua/gui-text-cf.cpp
src/lua/ibind.cpp
src/lua/inputmovie.cpp
src/lua/loadfile.cpp
src/lua/memory.cpp
src/lua/memory2.cpp