Public Git Hosting - lsnes.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: cd9ee7b 79dd270)

commit	59710f8f386e65dc27983f2f0b241cef6125b6b7
author	Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
	Wed, 24 Jul 2013 16:57:08 +0000 (24 19:57 +0300)
committer	Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
	Wed, 24 Jul 2013 16:57:08 +0000 (24 19:57 +0300)
tree	8094c352ceed084d1875378575241a0e7facd2e9	tree \| snapshot (tar.gz zip)
parent	cd9ee7be691cb1ed528cb0b2e2280fd8ff5c0dfe	commit \| diff
parent	79dd270a7ebb5e1be40646d2d7a4edb72a66f764	commit \| diff

Merge branch 'rr1-maint'

include/library/controller-data.hpp	diff1 \|	\|	blob \| history
include/library/luabase.hpp	diff1 \|	\|	blob \| history
include/lua/lua.hpp	diff1 \|	diff2 \|	blob \| history
manual.lyx	diff1 \|	diff2 \|	blob \| history
manual.txt	diff1 \|	diff2 \|	blob \| history
src/core/mainloop.cpp	diff1 \|	diff2 \|	blob \| history
src/core/moviedata.cpp	diff1 \|	diff2 \|	blob \| history
src/lua/inputmovie.cpp	\|	diff2 \|	blob \| history
src/lua/lua.cpp	diff1 \|	diff2 \|	blob \| history
src/platform/wxwidgets/mainwindow.cpp	diff1 \|	diff2 \|	blob \| history

Rerecording SNES/GB(C) emulator based on bsnes / gambatte core