Ilari Liusvaara 73fd1d4737 Merge branch 'rr1-maint' ... Conflicts: include/core/loadlib.hpp src/core/loadlib.cpp src/platform/wxwidgets/mainwindow.cpp		2013-03-25 11:35:41 +02:00
..
core	Wxwidgets: Filter filenames in load/save dialogs, autoappend extensions	2013-03-25 11:28:06 +02:00
fonts	Move core-specific code to core bindings	2012-07-09 18:11:32 +03:00
interface	Allow on_input to veto/force system controls (including reset line)	2013-03-13 00:36:44 +02:00
library	Merge branch 'rr1-maint'	2013-03-25 11:35:41 +02:00
lua	Merge branch 'rr1-maint'	2013-03-03 09:37:52 +02:00
platform/wxwidgets	Merge branch 'rr1-maint'	2013-03-25 11:35:41 +02:00
video	Split thread type defines to own header file	2012-10-24 23:51:26 +03:00
lsnes.hpp	Support multiple cores at once	2013-01-06 23:06:08 +02:00