Ryan Houdek 8c1091a21f Merge branch 'master' into GLSL-master ...

Conflicts:
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp

2013-03-15 11:19:52 -05:00

..

Src

Merge branch 'master' into GLSL-master

2013-03-15 11:19:52 -05:00

CMakeLists.txt

ARM Support without GLSL

2013-02-26 13:49:00 -06:00

Common.vcxproj

Fix "Common" to build with "Unicode" project setting.

2013-02-27 19:19:38 -06:00

Common.vcxproj.filters

ARM Support without GLSL

2013-02-26 13:49:00 -06:00

make_scmrev.h.js

Remove hash from revision description for cmake and windows.

2011-08-22 20:06:17 -05:00

SVNRevGen.vcxproj

fix Common lib re-linking all the time

2012-03-18 05:47:55 -07:00