diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-11-27 04:21:38 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-11-27 04:21:38 (GMT) |
| commit | 610ab20ddba6d07e9b6e0b7565a44913854e467b (patch) | |
| tree | 81c75e9ce9b68490bc5a81293290b96bb49d9510 /tests/system-gl.h | |
| parent | 2376814f2c4dd6e34a765ca37275b136785b26fd (diff) | |
| parent | 04c340b35d8809b595ebb3ce53b7a00313d00a9b (diff) | |
Merge remote branch 'upstream/master' into cakebaby
Conflicts:
doc/testing.txt
tests/CMakeLists.txt
tests/system-gl.cc
tests/system-gl.h
Diffstat (limited to 'tests/system-gl.h')
| -rw-r--r-- | tests/system-gl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/system-gl.h b/tests/system-gl.h index 45d5130..4a8ccac 100644 --- a/tests/system-gl.h +++ b/tests/system-gl.h @@ -4,7 +4,7 @@ #include <GL/glew.h> #include <string> -std::string glew_dump(bool dumpall); +std::string glew_dump(bool dumpall=false); bool report_glerror(const char *task); #endif |