summaryrefslogtreecommitdiff
path: root/src/render/shaders/shaderprogram.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-12-20 20:21:02 +0300
committerAndrei Karas <akaras@inbox.ru>2015-12-20 20:21:02 +0300
commit8cd4bfe47ea8ace9fc1f0ecf0eb68c844ab7a326 (patch)
tree2f4ceaa60c276c2948e6acbf79fefd999f29cd6e /src/render/shaders/shaderprogram.cpp
parentc4269ec3066959725f0f1d7670a14eadc8831a76 (diff)
downloadmv-8cd4bfe47ea8ace9fc1f0ecf0eb68c844ab7a326.tar.gz
mv-8cd4bfe47ea8ace9fc1f0ecf0eb68c844ab7a326.tar.bz2
mv-8cd4bfe47ea8ace9fc1f0ecf0eb68c844ab7a326.tar.xz
mv-8cd4bfe47ea8ace9fc1f0ecf0eb68c844ab7a326.zip
Fix regal and nacl conflict in headers.
Diffstat (limited to 'src/render/shaders/shaderprogram.cpp')
-rw-r--r--src/render/shaders/shaderprogram.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/shaders/shaderprogram.cpp b/src/render/shaders/shaderprogram.cpp
index e239a3eb7..1583ceee9 100644
--- a/src/render/shaders/shaderprogram.cpp
+++ b/src/render/shaders/shaderprogram.cpp
@@ -22,10 +22,10 @@
#include "render/shaders/shaderprogram.h"
+#include "render/opengl/mgl.h"
#ifdef __native_client__
#include "render/opengl/naclglfunctions.h"
#endif
-#include "render/opengl/mgl.h"
#include "render/shaders/shader.h"