Dolphin Emulator - Information on GLSL-master-3.5-280

Version: 3.5-280
Branch: GLSL-master
Date: 10 years, 3 months ago

Mac OS X

Commit

316a33d1e68ab47b2870345a04bb9dfd4f383f28

Change author

degasus

Change description

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

Information for GLSL-master-3.5-280