Merge branch 'glfw_upstream' of https://github.com/Luflosi/kitty into master

This commit is contained in:
Kovid Goyal 2020-09-08 17:45:04 +05:30
commit 83315f7999
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 2 additions and 2 deletions

2
glfw/glfw3.h vendored
View file

@ -1502,7 +1502,7 @@ typedef void (* GLFWwindowiconifyfun)(GLFWwindow*,int);
* @endcode
*
* @param[in] window The window that was maximized or restored.
* @param[in] iconified `true` if the window was maximized, or
* @param[in] maximized `true` if the window was maximized, or
* `false` if it was restored.
*
* @sa @ref window_maximize

2
kitty/glfw-wrapper.h generated
View file

@ -1240,7 +1240,7 @@ typedef void (* GLFWwindowiconifyfun)(GLFWwindow*,int);
* @endcode
*
* @param[in] window The window that was maximized or restored.
* @param[in] iconified `true` if the window was maximized, or
* @param[in] maximized `true` if the window was maximized, or
* `false` if it was restored.
*
* @sa @ref window_maximize