Merge branch 'master' into multi-monitor

Browse Source

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

...

This commit is contained in:

Camilla Berglund

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

parent fb465377e3 34c93a5124

commit c06f838d88

82 changed files with 4090 additions and 6527 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

src/x11_window.c

+165 -736

File diff suppressed because it is too large Load Diff