Public Git Hosting - lsnes.git/commit

commit	7d19748ed25039bd1643705840aa4936caf18071
author	Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
	Mon, 20 Feb 2012 19:19:53 +0000 (20 21:19 +0200)
committer	Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
	Mon, 20 Feb 2012 19:19:53 +0000 (20 21:19 +0200)
tree	8c366d74ffe7b564ff87783d9ef10ffb15cc1cb8	tree \| snapshot (tar.gz zip)
parent	9ecb1e97dc59dc2cfbeb595b8aa7d602613e88bc	commit \| diff
parent	1b464b9e6b3e963adc77eecb43a4034cc5f1f5e5	commit \| diff

Merge branch 'rr1-maint'

Conflicts:
src/platform/wxwidgets/mainwindow.cpp

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

include/platform/wxwidgets/platform.hpp	diff1 \|	diff2 \|	blob \| history
src/core/keymapper.cpp	diff1 \|	diff2 \|	blob \| history
src/core/mainloop.cpp	diff1 \|	diff2 \|	blob \| history
src/core/window.cpp	diff1 \|	diff2 \|	blob \| history
src/platform/wxwidgets/editor-keyselect.cpp	\|	diff2 \|	blob \| history
src/platform/wxwidgets/mainwindow.cpp	diff1 \|	diff2 \|	blob \| history