From: José Fonseca <jose.r.fonseca@gmail.com>
Date: Wed, 7 Nov 2012 07:20:06 +0000 (+0000)
Subject: Merge branch 'master' into d2d
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=4647f208f5a2b87391281e0f1202f66c23943bd9;p=apitrace

Merge branch 'master' into d2d
---

4647f208f5a2b87391281e0f1202f66c23943bd9
diff --cc wrappers/.gitignore
index 38fd57f,eeacd9f..cc5f074
--- a/wrappers/.gitignore
+++ b/wrappers/.gitignore
@@@ -1,5 -1,5 +1,6 @@@
+ OpenGL
  cgltrace.cpp
 +d2d1trace.cpp
  d3d10_1trace.cpp
  d3d10trace.cpp
  d3d11trace.cpp