Camilla Berglund cbcab56a25 Merge branch 'master' into EGL ...

Conflicts:
	include/GL/glfw3.h
	src/opengl.c
	src/win32_opengl.c
	src/window.c
	src/x11_fullscreen.c
	src/x11_glx_opengl.c
	src/x11_platform.h
	src/x11_window.c
	tests/glfwinfo.c

2012-09-06 21:05:03 +02:00

..

glfw3.h

Merge branch 'master' into EGL

2012-09-06 21:05:03 +02:00

glfw3native.h

Added explicit access to native handles.

2012-07-22 15:26:15 +02:00