diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2014-02-03 19:28:59 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2014-02-03 19:28:59 +0100 |
| commit | 0b9207bf8cfc83e25189d3a0e8d3c82d8ce988c4 (patch) | |
| tree | 336d7d91f8d7ee86995f275df7d20844d2b08463 /chart2 | |
| parent | 6472e791484e492cb2adfa898c43fbdeee7475ca (diff) | |
chart2: resolve merge conflict.
Change-Id: I5823d03af1eda3963c4ac52b60949402ca81f747
Diffstat (limited to 'chart2')
| -rwxr-xr-x | chart2/source/view/main/OpenGLRender.hxx | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx index 3dc1077e9a00..18176f6cbc67 100755 --- a/chart2/source/view/main/OpenGLRender.hxx +++ b/chart2/source/view/main/OpenGLRender.hxx @@ -9,22 +9,21 @@ #if defined( MACOSX ) #elif defined( UNX ) -#if defined( UNX ) -#include <prex.h> -#include "GL/glxew.h" -#include <postx.h> +# include <prex.h> +# include "GL/glxew.h" +# include <postx.h> #elif defined( _WIN32 ) -#include "prewin.h" -#include "windows.h" -#include "postwin.h" +# include "prewin.h" +# include "windows.h" +# include "postwin.h" #endif #if defined( MACOSX ) -#include <OpenGL/gl.h> -#include <OpenGL/glu.h> +# include <OpenGL/gl.h> +# include <OpenGL/glu.h> #else -#include <GL/gl.h> -#include <GL/glu.h> +# include <GL/gl.h> +# include <GL/glu.h> #endif #include <vcl/window.hxx> |