Jordan Woyak f3f89e1d00 Merge branch 'master' into vertex-loader-cleanup ...

Conflicts:
	Source/Core/Common/Src/CommonFuncs.h
	Source/Core/VideoCommon/Src/VertexLoader.cpp

2013-03-04 15:47:56 -06:00

..

Src

Merge branch 'master' into vertex-loader-cleanup

2013-03-04 15:47:56 -06: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