Jiga228/glfw
0
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-09-18 22:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into EGL

Browse Source 
Conflicts:
	src/internal.h
	src/opengl.c
	tests/glfwinfo.c
This commit is contained in:
Camilla Berglund
2012-08-02 02:41:57 +02:00
parent 0f1ab5317f c047bd2efe
commit 7d222030da
10 changed files with 63 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/GL/glfw3.h
-1
View File
@@ -392,7 +392,6 @@ extern "C" {
/* glfwGetWindowParam tokens */
#define GLFW_ACTIVE 0x00020001
#define GLFW_ICONIFIED 0x00020002
#define GLFW_ACCELERATED 0x00020003
#define GLFW_OPENGL_REVISION 0x00020004
/* The following constants are used for both glfwGetWindowParam