Merge branch 'rr1-maint'
commit68e86303081a4a2668b1cde068969f1482894b5e
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Fri, 27 Sep 2013 11:25:46 +0000 (27 14:25 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Fri, 27 Sep 2013 11:25:46 +0000 (27 14:25 +0300)
treed163f0c962dcd8e1661fbe94ae892a35ce8eef28
parent59ef6961e398c1af1ebbb47222ffd2c1b7aff727
parent11105969774029902333ec0c8d79de7b88405bd2
Merge branch 'rr1-maint'
13 files changed:
include/library/luabase.hpp
src/emulation/bsnes-legacy/core.cpp
src/lua/bind.cpp
src/lua/core.cpp
src/lua/disassemble.cpp
src/lua/gui-bitmap.cpp
src/lua/gui-core.cpp
src/lua/gui-rqueue.cpp
src/lua/gui-text-cf.cpp
src/lua/input.cpp
src/lua/memory.cpp
src/lua/movie.cpp
src/lua/screenshot.cpp