mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 12:19:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into Android-trash

Browse source
This commit is contained in:
Ryan Houdek 2013-04-13 00:58:37 -05:00
commit 605bbf5ca8
417 changed files with 23059 additions and 19251 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -145,7 +145,7 @@ void OpenGL_ReportARBProgramError()
{
GLint loc = 0;
glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &loc);
ERROR_LOG(VIDEO, "program error at %d: ", loc);
ERROR_LOG(VIDEO, "Program error at %d: ", loc);
ERROR_LOG(VIDEO, "%s", (char*)pstr);
ERROR_LOG(VIDEO, "\n");
}