Ilari Liusvaara efc06d1f10 Merge branch 'rr1-maint' ... Conflicts: manual.txt src/core/controller.cpp src/lua/dummy.cpp src/lua/input.cpp src/lua/lua.cpp src/platform/wxwidgets/mainwindow.cpp		2013-03-03 09:37:52 +02:00
..
core	Merge branch 'rr1-maint'	2013-02-28 04:06:37 +02:00
fonts	Move core-specific code to core bindings	2012-07-09 18:11:32 +03:00
interface	Some bizarre stuff...	2013-03-02 16:45:53 +02:00
library	Merge branch 'rr1-maint'	2013-03-03 09:37:52 +02:00
lua	Merge branch 'rr1-maint'	2013-03-03 09:37:52 +02:00
platform/wxwidgets	Cleanup many settings (all from core)	2013-02-09 21:22:24 +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