dolphin/Source/Plugins/Plugin_VideoOGL
NeoBrainX 7682ed22c6 Merge branch 'master' into perfqueries.
Conflicts:
	Source/Core/VideoCommon/Src/VideoConfig.h
	Source/Core/VideoCommon/VideoCommon.vcxproj.filters
	Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp
	Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp
2013-03-01 01:07:34 +01:00
..
Src Merge branch 'master' into perfqueries. 2013-03-01 01:07:34 +01:00
CMakeLists.txt Merge branch 'master' into perfqueries. 2013-03-01 01:07:34 +01:00
Plugin_VideoOGL.vcxproj Merge branch 'master' into perfqueries. 2013-03-01 01:07:34 +01:00
Plugin_VideoOGL.vcxproj.filters Windows build fix. 2012-08-26 20:26:10 +02:00