Camilla Berglund 83f5b920b9 Merge branch 'master' into multi-monitor ... Conflicts: .gitignore src/CMakeLists.txt src/x11_window.c		2012-09-12 06:04:17 +02:00
..
accuracy.c	Formatting.	2012-08-12 15:32:06 +02:00
clipboard.c	Removed implicit glfwMakeCurrentContext.	2012-08-10 15:29:45 +02:00
CMakeLists.txt	Added direct dependency on librt for threads test on X11.	2012-09-09 01:31:23 +02:00
defaults.c	Made defaults test window hidden.	2012-09-11 22:23:35 +02:00
events.c	Merge branch 'master' into multi-monitor	2012-08-29 20:36:07 +02:00
fsaa.c	Removed implicit glfwMakeCurrentContext.	2012-08-10 15:29:45 +02:00
fsfocus.c	Replaced glfwGetDesktopMode with glfwGetVideoMode.	2012-08-30 01:54:01 +02:00
gamma.c	Replaced glfwGetDesktopMode with glfwGetVideoMode.	2012-08-30 01:54:01 +02:00
glfwinfo.c	Merge branch 'master' into showwindow	2012-09-08 21:20:45 +02:00
iconify.c	Replaced glfwGetDesktopMode with glfwGetVideoMode.	2012-08-30 01:54:01 +02:00
joysticks.c	Renamed glfwGetJoystickPos to glfwGetJoystickAxes.	2012-08-29 18:58:16 +02:00
modes.c	Replaced glfwGetDesktopMode with glfwGetVideoMode.	2012-08-30 01:54:01 +02:00
peter.c	Removed implicit glfwMakeCurrentContext.	2012-08-10 15:29:45 +02:00
reopen.c	Removed implicit glfwMakeCurrentContext.	2012-08-10 15:29:45 +02:00
sharing.c	Removed implicit glfwMakeCurrentContext.	2012-08-10 15:29:45 +02:00
tearing.c	Formatting.	2012-08-12 15:32:06 +02:00
threads.c	Formatting.	2012-08-15 20:26:09 +02:00
title.c	Removed implicit glfwMakeCurrentContext.	2012-08-10 15:29:45 +02:00
windows.c	Moved GLFW_VISIBLE hint use to glfwinfo.	2012-08-28 17:52:22 +02:00