Merge branch 'master' into d2d

[apitrace] / .gitignore

diff --git a/.gitignore b/.gitignore
index 87f2f6732c40163209b661fbeff05aad3d41681d..89057b768b83236cf841158e9a38bd57888c211e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,16 @@
 .*.sw?
 *~
+*.7z
 *.a
 *.bmp
 *.bz2
+*.cmake
 *.dll
+*.dmg
 *.dylib
 *.exe
 *.exp
+*.gz
 *.ilk
 *.json
 *.lib
@@ -14,27 +18,34 @@
 *.obj
 *.pdb
 *.png
+*.pnm
 *.pyc
 *.pyo
 *.so
 *.trace
 *.zip
+_CPack_Packages
 CMakeCache.txt
 CMakeFiles
 Makefile
+apitrace
 build
-cmake_install.cmake
-d3d10.cpp
-d3d10_1.cpp
-d3d8.cpp
-d3d9.cpp
-ddraw.cpp
+cgltrace.cpp
+d2d1trace.cpp
+d3d10trace.cpp
+d3d8trace.cpp
+d3d9trace.cpp
+ddrawtrace.cpp
+dwritetrace.cpp
 dxsdk
+egltrace.cpp
+eglretrace
 glproc.hpp
 glretrace
 glretrace_gl.cpp
-glretrace_state.cpp
+glstate_params.cpp
 glxtrace.cpp
-tracedump
+install_manifest.txt
+qapitrace
 traces
 wgltrace.cpp