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

This commit is contained in:
Ryan Houdek
2013-04-13 00:58:37 -05:00
417 changed files with 23059 additions and 19251 deletions

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");
}