summaryrefslogtreecommitdiff
path: root/src/resources
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/resources
parentc4269ec3066959725f0f1d7670a14eadc8831a76 (diff)
downloadplus-8cd4bfe47ea8ace9fc1f0ecf0eb68c844ab7a326.tar.gz
plus-8cd4bfe47ea8ace9fc1f0ecf0eb68c844ab7a326.tar.bz2
plus-8cd4bfe47ea8ace9fc1f0ecf0eb68c844ab7a326.tar.xz
plus-8cd4bfe47ea8ace9fc1f0ecf0eb68c844ab7a326.zip
Fix regal and nacl conflict in headers.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/mobileopenglscreenshothelper.cpp2
-rw-r--r--src/resources/openglscreenshothelper.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/mobileopenglscreenshothelper.cpp b/src/resources/mobileopenglscreenshothelper.cpp
index 7efb0f3b9..9e18a0d7e 100644
--- a/src/resources/mobileopenglscreenshothelper.cpp
+++ b/src/resources/mobileopenglscreenshothelper.cpp
@@ -27,10 +27,10 @@
#include "configuration.h"
#include "graphicsmanager.h"
+#include "render/opengl/mgl.h"
#ifdef __native_client__
#include "render/opengl/naclglfunctions.h"
#endif
-#include "render/opengl/mgl.h"
#include "debug.h"
diff --git a/src/resources/openglscreenshothelper.cpp b/src/resources/openglscreenshothelper.cpp
index 648ec6942..5f5bec2dd 100644
--- a/src/resources/openglscreenshothelper.cpp
+++ b/src/resources/openglscreenshothelper.cpp
@@ -27,10 +27,10 @@
#include "configuration.h"
#include "graphicsmanager.h"
+#include "render/opengl/mgl.h"
#ifdef __native_client__
#include "render/opengl/naclglfunctions.h"
#endif
-#include "render/opengl/mgl.h"
#include "debug.h"