Merge branch 'master' into d2d

[apitrace] / .gitignore

diff --git a/.gitignore b/.gitignore
index e16a1f7a6f7100e4fc505e0123596d9c0c5fd352..89057b768b83236cf841158e9a38bd57888c211e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -31,10 +31,12 @@ Makefile
 apitrace
 build
 cgltrace.cpp
+d2d1trace.cpp
 d3d10trace.cpp
 d3d8trace.cpp
 d3d9trace.cpp
 ddrawtrace.cpp
+dwritetrace.cpp
 dxsdk
 egltrace.cpp
 eglretrace