Jiga228/glfw
0
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-09-21 08:39:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into EGL

Browse Source 
Conflicts:
	src/glx_opengl.c
	src/opengl.c
	tests/glfwinfo.c
This commit is contained in:
Camilla Berglund
2012-09-09 19:52:33 +02:00
parent 7493bbe0c8 feef05f839
commit 0272ce2e98
24 changed files with 1503 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/x11_platform.h
+1 -1
View File
@@ -235,7 +235,7 @@ void _glfwSetVideoMode(int* width, int* height, int* rate);
void _glfwRestoreVideoMode(void);
// Joystick input
void _glfwInitJoysticks(void);
int _glfwInitJoysticks(void);
void _glfwTerminateJoysticks(void);
// Unicode support