mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-03 00:42:39 +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/Core/VideoCommon/Src/VertexLoader.cpp
View file

@ -227,7 +227,7 @@ void VertexLoader::CompileVertexTranslator()
#ifdef USE_JIT
if (m_compiledCode)
PanicAlert("trying to recompile a vtx translator");
PanicAlert("Trying to recompile a vtx translator");
m_compiledCode = GetCodePtr();
ABI_EmitPrologue(4);