Camilla Berglund 7d222030da Merge branch 'master' into EGL ... Conflicts: src/internal.h src/opengl.c tests/glfwinfo.c		2012-08-02 02:50:17 +02:00
..
GL	Merge branch 'master' into EGL	2012-08-02 02:50:17 +02:00