Ilari Liusvaara fb203e1fc4 Merge branch 'rr1-maint' ... Conflicts: src/core/controller.cpp src/core/controllerframe.cpp		2012-05-13 02:07:22 +03:00
..
core	Merge branch 'rr1-maint'	2012-05-13 02:07:22 +03:00
interface	Refactor ROM slots handling	2012-04-15 09:52:00 +03:00
library	Merge branch 'rr1-maint'	2012-05-05 22:24:02 +03:00
lua	Merge branch 'rr1-maint'	2012-03-07 21:12:14 +02:00
platform	Wxwidgets: Add option to prompt for key in key select dialogs	2012-04-19 12:35:25 +03:00
video	Revamp the build system	2012-05-11 19:36:13 +03:00
lsnes.hpp	Refactor bsnes core version handling	2012-03-11 21:48:12 +02:00