diff options
| author | Anton Yabchinskiy | 2015-01-14 23:17:15 +0300 |
|---|---|---|
| committer | Anton Yabchinskiy | 2015-01-14 23:17:15 +0300 |
| commit | d6998995b54fd4fed83eef9db3bbb45fa60565db (patch) | |
| tree | 927e4e2441db1c62b3853d03f3ed4bb996881045 /drivers/gl_context/context_gl.cpp | |
| parent | b6c5cb1064eab63788060dc918d7fec53e57a532 (diff) | |
| parent | 04af74596d070f062bd917b0364d87c57544f8d5 (diff) | |
| download | godot-d6998995b54fd4fed83eef9db3bbb45fa60565db.tar.gz godot-d6998995b54fd4fed83eef9db3bbb45fa60565db.tar.zst godot-d6998995b54fd4fed83eef9db3bbb45fa60565db.zip | |
Merge branch 'master' of github.com:okamstudio/godot
Conflicts:
platform/x11/detect.py
Diffstat (limited to 'drivers/gl_context/context_gl.cpp')
| -rw-r--r-- | drivers/gl_context/context_gl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gl_context/context_gl.cpp b/drivers/gl_context/context_gl.cpp index 77a94f933..82195cc6f 100644 --- a/drivers/gl_context/context_gl.cpp +++ b/drivers/gl_context/context_gl.cpp @@ -12,7 +12,7 @@ #include "context_gl.h" -#if defined(OPENGL_ENABLED) || defined(LEGACYGL_ENABLED) || defined(GLES2_ENABLED) || defined(GLES1_ENABLED) +#if defined(OPENGL_ENABLED) || defined(GLES2_ENABLED) |