Merge branch 'master' into multi-monitor

Browse Source

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

...

This commit is contained in:

Camilla Berglund

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

parent 0f93d24306 fc69721807

commit 41bc0d18f4

36 changed files with 1239 additions and 678 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

include/GL/glfw3.h

+1073 -55

File diff suppressed because it is too large Load Diff