Public Git Hosting - lsnes.git/commit

commit	e75667068a37708ce6f2f40c03ab70b97d9e6cbe
author	Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
	Sat, 13 Apr 2013 19:20:00 +0000 (13 22:20 +0300)
committer	Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
	Sat, 13 Apr 2013 19:20:00 +0000 (13 22:20 +0300)
tree	95424eb13ba4dcd724cf80c5d93a9b44cd8af079	tree \| snapshot (tar.gz zip)
parent	4f92b113361f196ade0289ca4c0ec85c0cda60c5	commit \| diff
parent	b7dfe28ae195b6f17a9e1b7ba4015efcec2e42b7	commit \| diff

Merge branch 'rr1-maint'

Conflicts:
src/core/mainloop.cpp

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

include/core/moviedata.hpp	diff1 \|	diff2 \|	blob \| history
src/core/mainloop.cpp	diff1 \|	diff2 \|	blob \| history
src/core/moviedata.cpp	diff1 \|	diff2 \|	blob \| history
src/platform/wxwidgets/mainwindow.cpp	diff1 \|	diff2 \|	blob \| history