Merge branch 'master' into d3dretrace

diff --cc CMakeLists.txt
Simple merge

diff --cc glretrace.hpp
Simple merge

diff --cc glretrace_main.cpp
Simple merge

diff --cc retrace.cpp
index fe0694d6a3726faf24b45df321160645a498fc69,d2e6d379b06d283ca729e1712e80a22044103189..1630995cdb440551232c6bdfcd214ea1f61f2abe
--- 1/retrace.cpp
--- 2/retrace.cpp
+++ b/retrace.cpp
@@@ -34,10 -35,8 +35,11 @@@
  namespace retrace {
  
  
 +trace::Parser parser;
 +
 +
  int verbosity = 0;
+ bool profiling = false;
  
  
  static bool call_dumped = false;

diff --cc retrace.hpp
Simple merge