diff options
| author | Marius Kintel <marius@kintel.net> | 2011-10-04 19:06:40 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-10-04 19:06:40 (GMT) |
| commit | 799ca1d1b3f2e9142460ab3ce895a0641f54dfda (patch) | |
| tree | 6c168de6d55cb92b94b0ddeb54c668bd4946c10d /src/GLView.h | |
| parent | 9259d57659f61e9e56942bb36125f605f8f3c338 (diff) | |
| parent | f5e0f3a531b0c8806e4ebc62cd91ca31275ae481 (diff) | |
Merge branch 'master' into visitortests
Conflicts:
src/polyset.h
Diffstat (limited to 'src/GLView.h')
| -rw-r--r-- | src/GLView.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/GLView.h b/src/GLView.h index 1001754..3a36a15 100644 --- a/src/GLView.h +++ b/src/GLView.h @@ -1,11 +1,7 @@ #ifndef GLVIEW_H_ #define GLVIEW_H_ -#ifdef ENABLE_OPENCSG -// this must be included before the GL headers -# include <GL/glew.h> -#endif - +#include "system-gl.h" #include <QGLWidget> #include <QLabel> |