darkf 8ba9ac0f74 Fix merge conflicts		2014-12-29 19:47:41 -08:00
..
emu_window	License change	2014-12-20 21:20:24 -08:00
citra.cpp	License change	2014-12-20 21:20:24 -08:00
citra.rc	Support vs express edition without having to get platform sdk	2014-04-04 23:10:02 -04:00
CMakeLists.txt	Fix merge conflicts	2014-12-29 19:47:41 -08:00
config.cpp	GPU: Implement frameskip and remove forced framebuffer swap hack.	2014-12-28 22:14:05 -05:00
config.h	License change	2014-12-20 21:20:24 -08:00
default_ini.h	GPU: Implement frameskip and remove forced framebuffer swap hack.	2014-12-28 22:14:05 -05:00
resource.h	renamed from citrus to citra	2013-09-26 17:34:48 -04:00