degasus bff02b3b73 Merge branch 'arb_framebuffer' into GLSL-master ... Conflicts: Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp Source/Plugins/Plugin_VideoOGL/Src/Render.cpp Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp		2013-01-09 11:00:26 +01:00
..
Src	Merge branch 'arb_framebuffer' into GLSL-master	2013-01-09 11:00:26 +01:00
resources	Merge UI related projects into the main DolphinWX project.	2011-02-11 21:37:52 +00:00
CMakeLists.txt	Merge branch 'GLES-software'	2012-12-26 12:54:58 -06:00
Dolphin.vcxproj	remove cg from windows project files	2012-12-28 01:08:29 +01:00
Dolphin.vcxproj.filters	remove scons files from VS projects	2012-03-18 06:41:12 -07:00
Dolphin.vcxproj.user	vs2010: make -d be passed to debugfast builds launched from vs	2011-02-25 04:00:16 +00:00
DolphinWX.rc	Define the icon for "dolphin". The IDI_ICON1 seems to be preempted by the wx resource. This one does not.	2012-12-17 08:33:42 -06:00
Info.plist.in	Applied compile and link flags from SCons build for OS X to CMake build.	2011-12-11 21:27:06 +01:00
resource.h	set svn:eol-style=native for **.h	2008-12-08 04:46:09 +00:00