Ilari Liusvaara 891235f5d4 Merge branch 'rr1-maint' ... Conflicts: src/platform/wxwidgets/editor-movie.cpp		2013-02-07 18:14:50 +02:00
..
core	Merge branch 'rr1-maint'	2013-02-07 18:14:50 +02:00
fonts	Move core-specific code to core bindings	2012-07-09 18:11:32 +03:00
interface	Support for hard resets and make some stuff movie settings	2013-01-27 13:57:33 +02:00
library	Fix saving unconnected ports to movie	2013-02-05 23:43:18 +02:00
lua	Lua: Fix bug with methods and resetting Lua VM	2013-02-01 22:10:01 +02:00
platform/wxwidgets	Merge branch 'rr1-maint'	2013-02-03 17:41:09 +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