Merge branch 'master' into d2d

[apitrace] / .gitignore

diff --git a/.gitignore b/.gitignore
index ed1ea5a05b227f50e72f0e5c3d1df78a280c7a04..89057b768b83236cf841158e9a38bd57888c211e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,12 @@
 .*.sw?
 *~
+*.7z
 *.a
 *.bmp
 *.bz2
 *.cmake
 *.dll
+*.dmg
 *.dylib
 *.exe
 *.exp
@@ -26,12 +28,18 @@ _CPack_Packages
 CMakeCache.txt
 CMakeFiles
 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
@@ -39,6 +47,5 @@ glstate_params.cpp
 glxtrace.cpp
 install_manifest.txt
 qapitrace
-tracedump
 traces
 wgltrace.cpp