Merge branch 'master' into v3.0

scheibel · scheibel · commit 08cb575603fc · 2018-07-11T12:30:24.000+02:00
diff --git a/source/glbinding-aux/source/debug.cpp b/source/glbinding-aux/source/debug.cpp
@@ -14,7 +14,7 @@ namespace
 
 
 // Don't rely on Meta.h for now
-std::string readableErrorCode(gl::GLenum errorCode) const
+std::string readableErrorCode(gl::GLenum errorCode)
 {
     switch(errorCode)
     {

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ namespace`
`14`	`14`
`15`	`15`
`16`	`16`	`// Don't rely on Meta.h for now`
`17`		`-std::string readableErrorCode(gl::GLenum errorCode) const`
	`17`	`+std::string readableErrorCode(gl::GLenum errorCode)`
`18`	`18`	`{`
`19`	`19`	`switch(errorCode)`
`20`	`20`	`{`