mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-10-09 09:38:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into primitive_restart

Browse source 
Conflicts:
	Source/Core/VideoCommon/Src/VideoConfig.h
	Source/Plugins/Plugin_VideoDX9/Src/main.cpp
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
This commit is contained in:
degasus 2013-04-08 15:57:51 +02:00
commit 702198f39b
334 changed files with 21473 additions and 18765 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
View file

@ -234,7 +234,7 @@ void VertexManager::vFlush()
PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, 0, 0);
}
else
ERROR_LOG(VIDEO, "error loading texture");
ERROR_LOG(VIDEO, "Error loading texture");
}
}