Merge branch 'master' into multi-display-support

Conflicts:
	src/CMakeLists.txt
	src/input.c

examples/CMakeLists.txt

@@ -38,10 +38,3 @@ if(MSVC)
                         LINK_FLAGS "/ENTRY:mainCRTStartup")
 endif(MSVC)
 
-if(CYGWIN)
-  # Set cross-compile and subsystem compile and link flags
-  set_target_properties(${WINDOWS_BINARIES} PROPERTIES
-                        COMPILE_FLAGS "-mno-cygwin"
-                        LINK_FLAGS "-mno-cygwin -mwindows")
-endif(CYGWIN)
-

examples/heightmap.c

@@ -583,7 +583,7 @@ int main(int argc, char** argv)
         exit(EXIT_FAILURE);
     }
 
-    glfwOpenWindowHint(GLFW_WINDOW_NO_RESIZE, GL_TRUE);
+    glfwOpenWindowHint(GLFW_WINDOW_RESIZABLE, GL_FALSE);
     glfwOpenWindowHint(GLFW_OPENGL_VERSION_MAJOR, 3);
     glfwOpenWindowHint(GLFW_OPENGL_VERSION_MINOR, 2);
     glfwOpenWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);