Merge branch 'master' into joystickname

This commit is contained in:
Camilla Berglund
2012-12-02 16:36:44 +01:00
36 changed files with 1332 additions and 653 deletions
+1 -1
View File
@@ -191,7 +191,7 @@ int main(void)
exit(EXIT_FAILURE);
}
window = glfwCreateWindow(0, 0, GLFW_WINDOWED, "Joystick Test", NULL);
window = glfwCreateWindow(640, 480, GLFW_WINDOWED, "Joystick Test", NULL);
if (!window)
{
glfwTerminate();