Public Git Hosting - lsnes.git/commit

commit	73fd1d47375bf15c88af0a1251596ebaba249504
author	Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
	Mon, 25 Mar 2013 09:35:41 +0000 (25 11:35 +0200)
committer	Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
	Mon, 25 Mar 2013 09:35:41 +0000 (25 11:35 +0200)
tree	842f8352cfd50c52f1830ba644197462214e0088	tree \| snapshot (tar.gz zip)
parent	5b0f5b25f9646f1057785a9532d388b4379960a8	commit \| diff
parent	3e8f02fcafa62e34e12b575b4c2c679ae565c299	commit \| diff

Merge branch 'rr1-maint'

Conflicts:
include/core/loadlib.hpp
src/core/loadlib.cpp
src/platform/wxwidgets/mainwindow.cpp

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

include/library/loadlib.hpp	diff1 \|	\|	blob \| history
include/library/string.hpp	diff1 \|	diff2 \|	blob \| history
include/platform/wxwidgets/platform.hpp	diff1 \|	diff2 \|	blob \| history
src/library/loadlib.cpp	diff1 \|	\|	blob \| history
src/platform/wxwidgets/editor-voicesub.cpp	diff1 \|	diff2 \|	blob \| history
src/platform/wxwidgets/main.cpp	diff1 \|	diff2 \|	blob \| history
src/platform/wxwidgets/mainwindow.cpp	diff1 \|	diff2 \|	blob \| history