Commit Graph

13 Commits

Author SHA1 Message Date
Camilla Berglund cbcab56a25 Merge branch 'master' into EGL
Conflicts:
	include/GL/glfw3.h
	src/opengl.c
	src/win32_opengl.c
	src/window.c
	src/x11_fullscreen.c
	src/x11_glx_opengl.c
	src/x11_platform.h
	src/x11_window.c
	tests/glfwinfo.c
2012-09-06 21:05:03 +02:00
Camilla Berglund e10d935efe API tag and error message cleanup. 2012-08-28 15:03:57 +02:00
Camilla Berglund b03e62f6ac Made X11 resolution enumeration a separate function. 2012-08-02 18:54:47 +02:00
Camilla Berglund 871e1a70d7 Made video mode retrieval dynamic. 2012-08-02 18:03:43 +02:00
Camilla Berglund 2796ecb556 Updated platform API tags. 2012-07-20 03:28:03 +02:00
Cloudef d99e2385c1 Add temporary #ifdef in x11_fullscreen so EGL compiles 2012-07-17 22:25:47 +03:00
Camilla Berglund 61264339a7 Simplified X11 screen handling. 2012-04-05 16:14:01 +02:00
Camilla Berglund c2a2114590 Fixed GCC warnings. 2012-03-22 23:30:00 +01:00
Camilla Berglund 5fd66f7d30 Free visual list earlier. 2012-03-07 18:38:08 +01:00
Camilla Berglund 0c3b1b5a0e Removed allocator. 2012-02-07 14:58:58 +01:00
Camilla Berglund 0544afeb06 It is a platform error. 2011-09-26 15:40:18 +02:00
Camilla Berglund 5999a40aaa Improved legibility. 2011-09-26 15:38:11 +02:00
Camilla Berglund 0f93e8f252 Flattened source tree. 2011-07-26 15:16:34 +02:00