From 8cd4bfe47ea8ace9fc1f0ecf0eb68c844ab7a326 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 20 Dec 2015 20:21:02 +0300 Subject: Fix regal and nacl conflict in headers. --- src/render/shaders/shaderprogram.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/render/shaders/shaderprogram.cpp') 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" -- cgit v1.2.3-60-g2f50