Merge branch 'master' into d2d

author José Fonseca <jose.r.fonseca@gmail.com>

Wed, 7 Nov 2012 07:20:06 +0000 (07:20 +0000)

committer José Fonseca <jose.r.fonseca@gmail.com>

Wed, 7 Nov 2012 07:20:06 +0000 (07:20 +0000)
author José Fonseca <jose.r.fonseca@gmail.com>
Wed, 7 Nov 2012 07:20:06 +0000 (07:20 +0000)
committer José Fonseca <jose.r.fonseca@gmail.com>
Wed, 7 Nov 2012 07:20:06 +0000 (07:20 +0000)
diff --cc wrappers/.gitignore

index 38fd57f7c4b28767e7889bd76e8d8ee1ddec0cff,eeacd9f1a0e8dcfa1217a5f1dc123acde6b20302..cc5f074b65f5017f7ec6a52e5d9304c5d3c128a6
--- 1/wrappers/.gitignore
--- 2/wrappers/.gitignore
+++ b/wrappers/.gitignore
@@@ -1,5 -1,5 +1,6 @@@
+ OpenGL
   cgltrace.cpp
+ +d2d1trace.cpp
   d3d10_1trace.cpp
   d3d10trace.cpp
   d3d11trace.cpp
diff --cc wrappers/CMakeLists.txt
Simple merge
diff --cc wrappers/trace.py
Simple merge
author	José Fonseca <jose.r.fonseca@gmail.com>
	Wed, 7 Nov 2012 07:20:06 +0000 (07:20 +0000)
committer	José Fonseca <jose.r.fonseca@gmail.com>
	Wed, 7 Nov 2012 07:20:06 +0000 (07:20 +0000)
		1	2
wrappers/.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
wrappers/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
wrappers/trace.py	patch \|	diff1 \|	diff2 \|	blob \| history