glfw/tests
Camilla Berglund 7c426d1c92 Merge branch 'master' into multi-monitor
Conflicts:
	examples/wave.c
	src/init.c
	src/internal.h
	src/window.c
	tests/accuracy.c
	tests/events.c
	tests/reopen.c
2012-11-01 00:07:01 +01:00
..
accuracy.c Merge branch 'master' into multi-monitor 2012-11-01 00:07:01 +01:00
clipboard.c Merge branch 'master' into multi-monitor 2012-11-01 00:07:01 +01:00
CMakeLists.txt Added direct dependency on librt for threads test on X11. 2012-09-09 01:31:23 +02:00
defaults.c Begun integrating monitor and window. 2012-09-27 21:38:35 +02:00
events.c Merge branch 'master' into multi-monitor 2012-11-01 00:07:01 +01:00
fsaa.c Merge branch 'master' into multi-monitor 2012-11-01 00:07:01 +01:00
fsfocus.c Merge branch 'master' into multi-monitor 2012-11-01 00:07:01 +01:00
gamma.c Merge branch 'master' into multi-monitor 2012-11-01 00:07:01 +01:00
glfwinfo.c Merge branch 'master' into multi-monitor 2012-11-01 00:07:01 +01:00
iconify.c Merge branch 'master' into multi-monitor 2012-11-01 00:07:01 +01:00
joysticks.c Merge branch 'master' into multi-monitor 2012-11-01 00:07:01 +01:00
modes.c Merge branch 'master' into multi-monitor 2012-11-01 00:07:01 +01:00
peter.c Merge branch 'master' into multi-monitor 2012-11-01 00:07:01 +01:00
reopen.c Merge branch 'master' into multi-monitor 2012-11-01 00:07:01 +01:00
sharing.c Merge branch 'master' into multi-monitor 2012-11-01 00:07:01 +01:00
tearing.c Merge branch 'master' into multi-monitor 2012-11-01 00:07:01 +01:00
threads.c Begun integrating monitor and window. 2012-09-27 21:38:35 +02:00
title.c Merge branch 'master' into multi-monitor 2012-11-01 00:07:01 +01:00
windows.c Merge branch 'master' into multi-monitor 2012-11-01 00:07:01 +01:00