Merge branch 'master' into multi-monitor

Conflicts:
	tests/modes.c
This commit is contained in:
Camilla Berglund
2012-08-14 14:02:37 +02:00
53 changed files with 517 additions and 842 deletions
+1 -1
View File
@@ -79,7 +79,7 @@ GLFWAPI void glfwTerminate(void)
// Close all remaining windows
while (_glfwLibrary.windowListHead)
glfwCloseWindow(_glfwLibrary.windowListHead);
glfwDestroyWindow(_glfwLibrary.windowListHead);
if (!_glfwPlatformTerminate())
return;