Camilla Berglund c06f838d88 Merge branch 'master' into multi-monitor ...

Conflicts:
	.gitignore
	examples/CMakeLists.txt
	include/GL/glfw3.h
	src/CMakeLists.txt
	src/internal.h
	src/win32_platform.h
	src/win32_window.c
	src/x11_fullscreen.c
	src/x11_platform.h
	tests/listmodes.c

2012-07-05 16:15:01 +02:00

..

GL

Merge branch 'master' into multi-monitor

2012-07-05 16:15:01 +02:00