bunnei f446f79da2 Merge branch 'hardware-interface' ... Conflicts: src/core/src/core.h		2014-04-07 00:57:37 -04:00
..
citra	Merge branch 'hardware-interface'	2014-04-07 00:57:37 -04:00
citra_qt	Remove Core::GetState(). Use new ARM_Interface instead.	2014-04-04 23:24:09 -04:00
common	added "citra" instead of "emu" to title bar	2014-04-06 22:49:54 -04:00
core	Merge branch 'hardware-interface'	2014-04-07 00:57:37 -04:00
video_core	added support for renderering the external framebuffers	2014-04-07 00:52:34 -04:00
CMakeLists.txt	renamed from citrus to citra	2013-09-26 17:34:48 -04:00