dahjah/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-12-23 06:57:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
316a33d1e6
dolphin/Source/Core/VideoCommon
History
degasus 316a33d1e6 Merge branch 'master' into GLSL-master 
Conflicts:
	Source/Core/DolphinWX/Src/VideoConfigDiag.h
	Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
2012-12-27 10:36:54 +01:00
..
Src Merge branch 'master' into GLSL-master 2012-12-27 10:36:54 +01:00
CMakeLists.txt Implement a simple benchmarking mode which logs FPS to a file 2012-10-04 05:41:02 +02:00
OpenCL.rules Meta: 2010-06-02 18:00:22 +00:00
VideoCommon.vcxproj merge relevant changes from bc61dbdf58a8 in otu0001-desync-fix clone 2012-10-23 02:10:49 -04:00
VideoCommon.vcxproj.filters Implement a simple benchmarking mode which logs FPS to a file 2012-10-04 05:41:02 +02:00