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 showwindow

Browse Source 
Conflicts:
	src/window.c
This commit is contained in:
Camilla Berglund
2012-09-06 15:11:50 +02:00
parent d0ad28f174 a339098bc0
commit 9a183090e0
21 changed files with 88 additions and 2109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/internal.h
+1 -1
View File
@@ -276,7 +276,7 @@ const char* _glfwPlatformGetClipboardString(_GLFWwindow* window);
// Joystick input
int _glfwPlatformGetJoystickParam(int joy, int param);
int _glfwPlatformGetJoystickPos(int joy, float* pos, int numaxes);
int _glfwPlatformGetJoystickAxes(int joy, float* axes, int numaxes);
int _glfwPlatformGetJoystickButtons(int joy, unsigned char* buttons, int numbuttons);
// Time input