Camilla Berglund 41bc0d18f4 Merge branch 'master' into multi-monitor ...

Conflicts:
	include/GL/glfw3.h
	readme.html
	src/CMakeLists.txt
	src/win32_window.c
	src/window.c
	src/x11_window.c
	tests/clipboard.c
	tests/defaults.c
	tests/events.c
	tests/fsfocus.c
	tests/glfwinfo.c
	tests/joysticks.c
	tests/peter.c
	tests/sharing.c
	tests/tearing.c
	tests/title.c
	tests/windows.c

2012-11-27 16:55:04 +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-27 16:55:04 +01:00

CMakeLists.txt

Added direct dependency on librt for threads test on X11.

2012-09-09 01:31:23 +02:00

defaults.c

Merge branch 'master' into multi-monitor

2012-11-27 16:55:04 +01:00

events.c

Merge branch 'master' into multi-monitor

2012-11-27 16:55:04 +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-27 16:55:04 +01:00

gamma.c

Merge branch 'master' into multi-monitor

2012-11-27 16:55:04 +01:00

glfwinfo.c

Merge branch 'master' into multi-monitor

2012-11-27 16:55:04 +01:00

iconify.c

Merge branch 'master' into multi-monitor

2012-11-27 16:55:04 +01:00

joysticks.c

Merge branch 'master' into multi-monitor

2012-11-27 16:55:04 +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-27 16:55:04 +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-27 16:55:04 +01:00

tearing.c

Merge branch 'master' into multi-monitor

2012-11-27 16:55:04 +01:00

threads.c

Merge branch 'master' into multi-monitor

2012-11-27 16:55:04 +01:00

title.c

Merge branch 'master' into multi-monitor

2012-11-27 16:55:04 +01:00

windows.c

Merge branch 'master' into multi-monitor

2012-11-27 16:55:04 +01:00