From: José Fonseca <jose.r.fonseca@gmail.com>
Date: Sat, 17 Mar 2012 22:43:27 +0000 (+0000)
Subject: Merge branch 'master' into d3dretrace
X-Git-Url: https://git.cworth.org/git?p=apitrace;a=commitdiff_plain;h=ee659c84695e9f94b1f6a5f8be203dc0012ca685

Merge branch 'master' into d3dretrace
---

ee659c84695e9f94b1f6a5f8be203dc0012ca685
diff --cc retrace.cpp
index fe0694d,d2e6d37..1630995
--- a/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;