NeoBrainX ca22872dae Merge 'master' into shader-uids-awesome. ...

Conflicts:
	Source/Core/VideoCommon/Src/LightingShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.h
	Source/Core/VideoCommon/Src/VertexShaderGen.cpp

2013-06-17 12:05:47 +02:00

..

Android

Merge branch 'GLES3'

2013-06-12 03:29:18 -05:00

Core

Merge 'master' into shader-uids-awesome.

2013-06-17 12:05:47 +02:00

DSPSpy

…

DSPTool

Buildfix for dsptool.

2013-05-21 20:30:09 -04:00

Plugins

Merge 'master' into shader-uids-awesome.

2013-06-17 12:05:47 +02:00

TestSuite

clear cg from project files

2013-02-27 10:55:25 +01:00

UnitTests

Adding unit test project to VS solution

2013-05-22 03:29:58 +02:00

VSProps

clear cg from project files

2013-02-27 10:55:25 +01:00

CMakeLists.txt

…

Dolphin_2010.sln

Adding unit test project to VS solution

2013-05-22 03:29:58 +02:00