Merge branch 'master' into multi-monitor

Conflicts:
	include/GL/glfw3.h
	readme.html
	src/fullscreen.c
	src/internal.h
	src/window.c
	src/x11_fullscreen.c

tests/accuracy.c

@@ -108,7 +108,7 @@ int main(void)
 
     set_swap_interval(window, swap_interval);
 
-    while (!glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED))
+    while (!glfwGetWindowParam(window, GLFW_SHOULD_CLOSE))
     {
         glClear(GL_COLOR_BUFFER_BIT);
 

tests/events.c

@@ -414,7 +414,7 @@ int main(void)
 
     printf("Main loop starting\n");
 
-    while (!glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED))
+    while (!glfwGetWindowParam(window, GLFW_SHOULD_CLOSE))
         glfwWaitEvents();
 
     glfwTerminate();

tests/fsaa.c

@@ -97,7 +97,7 @@ int main(int argc, char** argv)
     else
         printf("Requesting that FSAA not be available\n");
 
-    glfwWindowHint(GLFW_FSAA_SAMPLES, samples);
+    glfwWindowHint(GLFW_SAMPLES, samples);
 
     window = glfwCreateWindow(800, 400, "Aliasing Detector", NULL, NULL);
     if (!window)
@@ -128,7 +128,7 @@ int main(int argc, char** argv)
     gluOrtho2D(0.f, 1.f, 0.f, 0.5f);
     glMatrixMode(GL_MODELVIEW);
 
-    while (!glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED))
+    while (!glfwGetWindowParam(window, GLFW_SHOULD_CLOSE))
     {
         GLfloat time = (GLfloat) glfwGetTime();
 

tests/joysticks.c

@@ -207,7 +207,7 @@ int main(void)
     glfwMakeContextCurrent(window);
     glfwSwapInterval(1);
 
-    while (!glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED))
+    while (!glfwGetWindowParam(window, GLFW_SHOULD_CLOSE))
     {
         glClear(GL_COLOR_BUFFER_BIT);
 

tests/peter.c

@@ -129,7 +129,7 @@ int main(void)
 
     glClearColor(0.f, 0.f, 0.f, 0.f);
 
-    while (!glfwGetWindowParam(window_handle, GLFW_CLOSE_REQUESTED))
+    while (!glfwGetWindowParam(window_handle, GLFW_SHOULD_CLOSE))
     {
         glClear(GL_COLOR_BUFFER_BIT);
 

tests/tearing.c

@@ -91,7 +91,7 @@ int main(void)
     glOrtho(-1.f, 1.f, -1.f, 1.f, 1.f, -1.f);
     glMatrixMode(GL_MODELVIEW);
 
-    while (!glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED))
+    while (!glfwGetWindowParam(window, GLFW_SHOULD_CLOSE))
     {
         glClear(GL_COLOR_BUFFER_BIT);
 

tests/threads.c

@@ -121,7 +121,7 @@ int main(void)
 
         for (i = 0;  i < count;  i++)
         {
-            if (glfwGetWindowParam(threads[i].window, GLFW_CLOSE_REQUESTED))
+            if (glfwGetWindowParam(threads[i].window, GLFW_SHOULD_CLOSE))
                 running = GL_FALSE;
         }
     }

tests/title.c

@@ -63,7 +63,7 @@ int main(void)
 
     glfwSetWindowSizeCallback(window, window_size_callback);
 
-    while (!glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED))
+    while (!glfwGetWindowParam(window, GLFW_SHOULD_CLOSE))
     {
         glClear(GL_COLOR_BUFFER_BIT);
         glfwSwapBuffers(window);

tests/windows.c

@@ -82,7 +82,7 @@ int main(void)
             glClear(GL_COLOR_BUFFER_BIT);
             glfwSwapBuffers(windows[i]);
 
-            if (glfwGetWindowParam(windows[i], GLFW_CLOSE_REQUESTED))
+            if (glfwGetWindowParam(windows[i], GLFW_SHOULD_CLOSE))
                 running = GL_FALSE;
         }