Camilla Berglund 835f00eb10 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		2012-12-31 21:13:10 +01:00
..
accuracy.c	Merge branch 'master' into multi-monitor	2012-12-31 21:13:10 +01:00
clipboard.c	Merge branch 'master' into multi-monitor	2012-12-30 22:18:15 +01:00
CMakeLists.txt	Temporary fix for OPENGL_INCLUDE_DIR being NOTFOUND on OS X 10.8.	2012-12-27 18:04:24 +01:00
defaults.c	Ripped out horribly broken refresh rate mess.	2012-12-31 02:06:19 +01:00
events.c	Merge branch 'master' into multi-monitor	2012-12-31 21:13:10 +01:00
fsaa.c	Merge branch 'master' into multi-monitor	2012-12-31 21:13:10 +01:00
fsfocus.c	Merge branch 'master' into multi-monitor	2012-12-30 22:18:15 +01:00
gamma.c	Merge branch 'master' into multi-monitor	2012-12-30 22:18:15 +01:00
glfwinfo.c	Merge branch 'master' into multi-monitor	2012-12-30 22:18:15 +01:00
iconify.c	Merge branch 'master' into multi-monitor	2012-12-30 22:18:15 +01:00
joysticks.c	Merge branch 'master' into multi-monitor	2012-12-31 21:13:10 +01:00
modes.c	Added primary status to monitor listing.	2012-12-22 23:37:42 +01:00
peter.c	Merge branch 'master' into multi-monitor	2012-12-31 21:13:10 +01:00
reopen.c	Merge branch 'master' into multi-monitor	2012-12-30 22:18:15 +01:00
sharing.c	Merge branch 'master' into multi-monitor	2012-12-30 22:18:15 +01:00
tearing.c	Merge branch 'master' into multi-monitor	2012-12-31 21:13:10 +01:00
threads.c	Merge branch 'master' into multi-monitor	2012-12-31 21:13:10 +01:00
title.c	Merge branch 'master' into multi-monitor	2012-12-31 21:13:10 +01:00
windows.c	Merge branch 'master' into multi-monitor	2012-12-31 21:13:10 +01:00