Merge branch 'EGL' of github.com:elmindreda/glfw into EGL

Conflicts: include/GL/glfw3.h
ago%!(EXTRA string=13 years) · 0f0f7f7294
parent e4ddcefc14 8d2043821f
commit 0f0f7f7294
1 changed files with 2 additions and 0 deletions
--- a/include/GL/glfw3.h
+++ b/include/GL/glfw3.h
@ -188,6 +188,8 @@ extern "C" {
 #else
  #if defined(GLFW_INCLUDE_GLCOREARB)
    #include <GL/glcorearb.h>
  #elif defined(GLFW_INCLUDE_ES1)
    #include <GLES/gl.h>
  #elif defined(GLFW_INCLUDE_ES2)
    #include <GLES2/gl2.h>
  #else