dolphin/Source/Core/DolphinWX
degasus e0ffdda26e Merge branch 'immediate-removal' into GLSL-master
Conflicts:
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp

immediate-removal is a new created branch seperated from master but reverted the revert of immediate-removal
so we get less conflicts by merging
2013-01-24 16:58:28 +01:00
..
resources Remove some unused resource files. 2013-01-16 17:09:09 -06:00
Src Merge branch 'immediate-removal' into GLSL-master 2013-01-24 16:58:28 +01: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
Dolphin.vcxproj.user
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
resource.h