Merge branch 'master' into showwindow

Conflicts:
	readme.html
This commit is contained in:
Camilla Berglund
2012-09-08 21:20:45 +02:00
22 changed files with 1462 additions and 130 deletions
+3
View File
@@ -290,6 +290,9 @@ int main(int argc, char** argv)
get_glfw_profile_name(glfwGetWindowParam(window, GLFW_OPENGL_PROFILE)));
}
printf("OpenGL context debug flag saved by GLFW: %s\n",
glfwGetWindowParam(window, GLFW_OPENGL_DEBUG_CONTEXT) ? "true" : "false");
printf("OpenGL context renderer string: \"%s\"\n", glGetString(GL_RENDERER));
printf("OpenGL context vendor string: \"%s\"\n", glGetString(GL_VENDOR));