NeoBrainX 5e6b712651 Merge 'master' into shader-uids-awesome. ...

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

2013-04-25 14:05:54 +02:00

..

Plugin_VideoDX9

Merge 'master' into shader-uids-awesome.

2013-04-25 14:05:54 +02:00

Plugin_VideoDX11

Merge 'master' into shader-uids-awesome.

2013-04-25 14:05:54 +02:00

Plugin_VideoOGL

Merge 'master' into shader-uids-awesome.

2013-04-25 14:05:54 +02:00

Plugin_VideoSoftware

Fix a bunch of random typos in comments and logging.

2013-04-19 09:21:45 -04:00

CMakeLists.txt

Initial push of GLES and GLUtil file breakup.

2012-12-17 14:54:20 -06:00