Merge branch 'master' into EGL

Browse Source

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

...

This commit is contained in:

Camilla Berglund

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

parent 9d6945a766 fc69721807

commit e4ddcefc14

50 changed files with 1569 additions and 928 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1171

include/GL/glfw3.h

File diff suppressed because it is too large Load Diff