Merge branch 'master' into noglut

Conflicts:
	CMakeLists.txt

1 files changed, 0 insertions, 6 deletions

diff --git a/glretrace.py b/glretrace.py
index 312c9a3..450ce7d 100644
--- a/glretrace.py
+++ b/glretrace.py
@@ -167,8 +167,6 @@ if __name__ == '__main__':
 #include <stdio.h>
 #include <iostream>
 
-#define RETRACE
-
 #include "glproc.hpp"
 #include "glstate.hpp"
 #include "glws.hpp"
@@ -428,10 +426,6 @@ int main(int argc, char **argv)
     __context = __ws->createContext(__visual);
     __ws->makeCurrent(__drawable, __context);
 
-    for (GLuint h = 0; h < 1024; ++h) {
-        __list_map[h] = h;
-    }
-
     for ( ; i < argc; ++i) {
         if (parser.open(argv[i])) {
             __startTime = OS::GetTime();