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

Conflicts:
	CMakeLists.txt
	include/GL/glfw3.h
	readme.html
	src/CMakeLists.txt
	src/cocoa_window.m
	src/config.h.in
	src/glx_opengl.c
	src/internal.h
	src/opengl.c
	src/window.c
	tests/glfwinfo.c

2012-11-27 12:21:54 +01:00

..

glfw3.h

Merge branch 'master' into EGL

2012-11-27 12:21:54 +01:00

glfw3native.h

Added explicit access to native handles.

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