Commit c324107f authored by Martin Schultz's avatar Martin Schultz
Browse files

Merge branch 'newGLLoader' of...

Merge branch 'newGLLoader' of https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/OpenFlipper-Free into newGLLoader

Conflicts:
	ACG/GL/gl_compat_4_4.cc
parents bc9b8fa0 7ff86957
Pipeline #271 passed with stage
......@@ -4226,7 +4226,7 @@ static int Load_Version_4_4(void)
typedef int (*PFN_LOADFUNCPOINTERS)(void);
typedef struct ogl_StrToExtMap_s
{
const char *extensionName;
const char *extensionName;
int *extensionVariable;
PFN_LOADFUNCPOINTERS LoadExtension;
} ogl_StrToExtMap;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment