Public Git Hosting - lsnes.git/commit

commit	6677ef19b103b9c5cd925adb1ba10ea08dd87c6f
author	Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
	Fri, 10 May 2013 23:35:11 +0000 (11 02:35 +0300)
committer	Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
	Fri, 10 May 2013 23:35:11 +0000 (11 02:35 +0300)
tree	0f09033d8341f33c7565d0772a7a2eb247b9d5ef	tree \| snapshot (tar.gz zip)
parent	8b1b021d00f94ef0e30804252e329918149632fe	commit \| diff
parent	9dc12ae74668bd47cd0f912e8a85c4232763897d	commit \| diff

Merge branch 'rr1-maint'

Conflicts:
src/platform/wxwidgets/memorysearch.cpp
src/platform/wxwidgets/status.cpp
src/platform/wxwidgets/textrender.cpp

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

src/platform/wxwidgets/mainwindow.cpp	diff1 \|	diff2 \|	blob \| history
src/platform/wxwidgets/memorysearch.cpp	diff1 \|	diff2 \|	blob \| history
src/platform/wxwidgets/status.cpp	diff1 \|	diff2 \|	blob \| history
src/platform/wxwidgets/textrender.cpp	diff1 \|	diff2 \|	blob \| history