diff options
| author | David Reid <[email protected]> | 2018-05-21 20:26:28 +1000 |
|---|---|---|
| committer | David Reid <[email protected]> | 2018-05-21 20:26:28 +1000 |
| commit | 6d8cc250bd086a6bfdf34effad4b9b3cca3e97a7 (patch) | |
| tree | 95d9092e666ef409dd4cb75a5f836e37acabfdf9 /src/external/glfw/include/GLFW/glfw3.h | |
| parent | 3ca5047c8285318c2385c6b52b2e2b5f12905f0d (diff) | |
| parent | e025e62445913bf1ec9cf075eaaf1dc7374da83c (diff) | |
| download | raylib-6d8cc250bd086a6bfdf34effad4b9b3cca3e97a7.tar.gz raylib-6d8cc250bd086a6bfdf34effad4b9b3cca3e97a7.zip | |
Merge branch 'master' of https://github.com/raysan5/raylib into dr/mini_al
Diffstat (limited to 'src/external/glfw/include/GLFW/glfw3.h')
| -rw-r--r-- | src/external/glfw/include/GLFW/glfw3.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/external/glfw/include/GLFW/glfw3.h b/src/external/glfw/include/GLFW/glfw3.h index 217b2c5d..00256d4d 100644 --- a/src/external/glfw/include/GLFW/glfw3.h +++ b/src/external/glfw/include/GLFW/glfw3.h @@ -4697,7 +4697,7 @@ GLFWAPI const char* glfwGetJoystickGUID(int jid); * This function may be called from the joystick callback, even for a joystick * that is being disconnected. * - * @param[in] joystick The joystick whose pointer to set. + * @param[in] jid The joystick whose pointer to set. * @param[in] pointer The new value. * * @errors Possible errors include @ref GLFW_NOT_INITIALIZED. @@ -4722,7 +4722,7 @@ GLFWAPI void glfwSetJoystickUserPointer(int jid, void* pointer); * This function may be called from the joystick callback, even for a joystick * that is being disconnected. * - * @param[in] joystick The joystick whose pointer to return. + * @param[in] jid The joystick whose pointer to return. * * @errors Possible errors include @ref GLFW_NOT_INITIALIZED. * @@ -4874,7 +4874,7 @@ GLFWAPI const char* glfwGetGamepadName(int jid); * * Not all devices have all the buttons or axes provided by @ref * GLFWgamepadstate. Unavailable buttons and axes will always report - * `GLFW_RELEASE` and 1.0 respectively. + * `GLFW_RELEASE` and 0.0 respectively. * * @param[in] jid The [joystick](@ref joysticks) to query. * @param[out] state The gamepad input state of the joystick. |