Camilla Berglund 835f00eb10 Merge branch 'master' into multi-monitor ...

Conflicts:
	include/GL/glfw3.h
	readme.html
	src/fullscreen.c
	src/internal.h
	src/window.c
	src/x11_fullscreen.c

2012-12-31 21:13:10 +01:00

..

boing.c

Merge branch 'master' into multi-monitor

2012-12-31 21:13:10 +01:00

CMakeLists.txt

Temporary fix for OPENGL_INCLUDE_DIR being NOTFOUND on OS X 10.8.

2012-12-27 18:04:24 +01:00

gears.c

Merge branch 'master' into multi-monitor

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

heightmap.c

Merge branch 'master' into multi-monitor

2012-12-13 02:23:38 +01:00

splitview.c

Merge branch 'master' into multi-monitor

2012-12-31 21:13:10 +01:00

triangle.c

Merge branch 'master' into multi-monitor

2012-12-31 21:13:10 +01:00

wave.c

Merge branch 'master' into multi-monitor

2012-12-30 22:18:15 +01:00