Merge branch 'master' into multi-monitor

Conflicts:
	.gitignore
	src/CMakeLists.txt
	src/x11_window.c

.gitignore

@@ -1,9 +1,18 @@
 .DS_Store
+Makefile
 CMakeCache.txt
 CMakeFiles
 cmake_install.cmake
 cmake_uninstall.cmake
 docs/Doxyfile
+src/config.h
+src/glfw3.pc
+src/libglfw3.so
+src/libglfw3.a
+src/libglfw3.dylib
+src/glfw3.lib
+src/glfw3.dll
+src/glfw3dll.lib
 examples/*.app
 examples/*.exe
 examples/boing
@@ -13,21 +22,11 @@ examples/splitview
 examples/triangle
 examples/wave
 src/config.h
-src/glfw.dll
-src/glfw.lib
-src/glfwdll.lib
-src/libglfw.a
-src/libglfw.dll
-src/libglfw.dylib
-src/libglfw.lib
-src/libglfw.pc
-src/libglfw.so
-src/libglfwdll.lib
 tests/*.app
 tests/*.exe
 tests/accuracy
+tests/clipboard
 tests/defaults
-tests/dynamic
 tests/events
 tests/fsaa
 tests/fsfocus
@@ -35,10 +34,12 @@ tests/gamma
 tests/glfwinfo
 tests/iconify
 tests/joysticks
+tests/modes
 tests/peter
 tests/reopen
 tests/sharing
 tests/tearing
+tests/threads
 tests/title
 tests/version
 tests/windows