Merge branch 'master' into EGL

2026-09-22 16:52:57 +00:00 · 2012-12-02 17:11:17 +01:00
parent 280782a2a5 20c891f566
commit 14e71833bd
10 changed files with 114 additions and 15 deletions
@@ -209,6 +209,7 @@ typedef struct _GLFWlibraryX11
        int             numButtons;
        float*          axis;
        unsigned char*  button;
+        char*           name;
    } joystick[GLFW_JOYSTICK_LAST + 1];

 } _GLFWlibraryX11;