Merge branch 'master' into d2d

[apitrace] / .gitignore

diff --git a/.gitignore b/.gitignore
index 5699afc945d2c0e0d2b953402148bf891dad581f..89057b768b83236cf841158e9a38bd57888c211e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -31,11 +31,15 @@ Makefile
 apitrace
 build
 cgltrace.cpp
+d2d1trace.cpp
 d3d10trace.cpp
 d3d8trace.cpp
 d3d9trace.cpp
 ddrawtrace.cpp
+dwritetrace.cpp
 dxsdk
+egltrace.cpp
+eglretrace
 glproc.hpp
 glretrace
 glretrace_gl.cpp