diff options
| author | Marius Kintel <marius@kintel.net> | 2011-12-19 14:41:11 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-12-19 14:41:11 (GMT) |
| commit | 87ce149df2581361e8975bd1a0addf2b6ef61e3d (patch) | |
| tree | c68db815a72cc767b6d51be0a57e9946c5f0a619 /tests/system-gl.h | |
| parent | ba1f0b7489dd5fa9bdc8c44068040f13113b40d0 (diff) | |
| parent | 638743e2201c6869b48857dd2db5ec01df665162 (diff) | |
Merge branch 'master' into boost_filesystem
Conflicts:
boost.pri
tests/CMakeLists.txt
Diffstat (limited to 'tests/system-gl.h')
| -rw-r--r-- | tests/system-gl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/system-gl.h b/tests/system-gl.h index b41e32c..4a8ccac 100644 --- a/tests/system-gl.h +++ b/tests/system-gl.h @@ -2,8 +2,9 @@ #define SYSTEMGL_H_ #include <GL/glew.h> +#include <string> -void glew_dump(bool dumpall = false); +std::string glew_dump(bool dumpall=false); bool report_glerror(const char *task); #endif |