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

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

Commit

2f78986e2cc28c7093bb9b7a784d1b3c0ce2e682

Change author

degasus

Change description

Merge branch 'Graphic_Update' into GLSL-master

Conflicts:
	Source/Core/VideoCommon/Src/VertexManagerBase.cpp
	Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp

Information for GLSL-master-3.5-344