diff options
| author | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-01-11 08:06:31 +0800 |
|---|---|---|
| committer | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-01-11 08:06:31 +0800 |
| commit | 291d7992ceae487a63dc2d6eb1ee2da7312017c5 (patch) | |
| tree | 6bd0489107fa33477ccc7e7553c79d3001fe433a /drivers/gl_context/context_gl.cpp | |
| parent | a8e3c5c0b7fb202bcceb06b9373b5b6a4ff8f9b8 (diff) | |
| parent | d30f4e52f654a26e14223a6ef9a946cc6282c0db (diff) | |
Merge branch 'master' into x11-fullscreen
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 77a94f9333..82195cc6f6 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) |