Public Git Hosting - lsnes.git/commit

commit	c3dd13fb3f76c0e09b657c2e0d062977c164d8a9
author	Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
	Wed, 7 Mar 2012 04:19:06 +0000 (7 06:19 +0200)
committer	Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
	Wed, 7 Mar 2012 04:19:06 +0000 (7 06:19 +0200)
tree	05f75fd104051938e11799121eeff518616769e9	tree \| snapshot (tar.gz zip)
parent	a5082a77d583835ff4e6f1b9bbe9f5fd1a9b6099	commit \| diff
parent	923154bf5cae1a6e87c5eaa8bbf15401f7a56f2e	commit \| diff

Merge remote-tracking branch 'origin/rr1-maint'

Conflicts:
Makefile
src/lua/core.cpp
src/lua/lua.cpp

20 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
include/core/controllerframe.hpp	diff1 \|	diff2 \|	blob \| history
include/core/framebuffer.hpp	diff1 \|	diff2 \|	blob \| history
include/lua/internal.hpp	diff1 \|	diff2 \|	blob \| history
include/lua/lua.hpp	diff1 \|	diff2 \|	blob \| history
include/platform/wxwidgets/window_status.hpp	diff1 \|	diff2 \|	blob \| history
manual.lyx	diff1 \|	diff2 \|	blob \| history
manual.txt	diff1 \|	diff2 \|	blob \| history
src/core/framebuffer.cpp	diff1 \|	diff2 \|	blob \| history
src/core/mainloop.cpp	diff1 \|	diff2 \|	blob \| history
src/core/misc.cpp	diff1 \|	diff2 \|	blob \| history
src/core/moviedata.cpp	diff1 \|	diff2 \|	blob \| history
src/core/window.cpp	diff1 \|	diff2 \|	blob \| history
src/lua/core.cpp	diff1 \|	diff2 \|	blob \| history
src/lua/dummy.cpp	diff1 \|	\|	blob \| history
src/lua/gui-bitmap.cpp	diff1 \|	diff2 \|	blob \| history
src/lua/input.cpp	diff1 \|	diff2 \|	blob \| history
src/lua/lua.cpp	diff1 \|	diff2 \|	blob \| history
src/platform/wxwidgets/keyboard.cpp	diff1 \|	diff2 \|	blob \| history
src/platform/wxwidgets/status.cpp	diff1 \|	diff2 \|	blob \| history

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

Makefile	diff1 \|	diff2 \|	blob \| history
include/core/controllerframe.hpp	diff1 \|	diff2 \|	blob \| history
include/core/framebuffer.hpp	diff1 \|	diff2 \|	blob \| history
include/lua/internal.hpp	diff1 \|	diff2 \|	blob \| history
include/lua/lua.hpp	diff1 \|	diff2 \|	blob \| history
include/platform/wxwidgets/window_status.hpp	diff1 \|	diff2 \|	blob \| history
manual.lyx	diff1 \|	diff2 \|	blob \| history
manual.txt	diff1 \|	diff2 \|	blob \| history
src/core/framebuffer.cpp	diff1 \|	diff2 \|	blob \| history
src/core/mainloop.cpp	diff1 \|	diff2 \|	blob \| history
src/core/misc.cpp	diff1 \|	diff2 \|	blob \| history
src/core/moviedata.cpp	diff1 \|	diff2 \|	blob \| history
src/core/window.cpp	diff1 \|	diff2 \|	blob \| history
src/lua/core.cpp	diff1 \|	diff2 \|	blob \| history
src/lua/dummy.cpp	diff1 \|	\|	blob \| history
src/lua/gui-bitmap.cpp	diff1 \|	diff2 \|	blob \| history
src/lua/input.cpp	diff1 \|	diff2 \|	blob \| history
src/lua/lua.cpp	diff1 \|	diff2 \|	blob \| history
src/platform/wxwidgets/keyboard.cpp	diff1 \|	diff2 \|	blob \| history
src/platform/wxwidgets/status.cpp	diff1 \|	diff2 \|	blob \| history