Merge branch 'master' into d2d

[apitrace] / .gitignore

diff --git a/.gitignore b/.gitignore
index 7fac701286dc7d08693a9b8ce98be39df84349b1..89057b768b83236cf841158e9a38bd57888c211e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,33 +1,51 @@
 .*.sw?
-.scon*
 *~
+*.7z
 *.a
+*.bmp
 *.bz2
+*.cmake
 *.dll
+*.dmg
+*.dylib
 *.exe
 *.exp
 *.gz
 *.ilk
+*.json
 *.lib
 *.o
 *.obj
 *.pdb
+*.png
+*.pnm
 *.pyc
 *.pyo
 *.so
-*.xml
+*.trace
 *.zip
-CMakeFiles
+_CPack_Packages
 CMakeCache.txt
-cmake_install.cmake
+CMakeFiles
 Makefile
-MD5SUM
-config.log
-ddraw.cpp
-d3d8.cpp
-d3d9.cpp
-d3d10.cpp
-d3d10_1.cpp
+apitrace
+build
+cgltrace.cpp
+d2d1trace.cpp
+d3d10trace.cpp
+d3d8trace.cpp
+d3d9trace.cpp
+ddrawtrace.cpp
+dwritetrace.cpp
 dxsdk
-glx.cpp
-opengl32.cpp
+egltrace.cpp
+eglretrace
+glproc.hpp
+glretrace
+glretrace_gl.cpp
+glstate_params.cpp
+glxtrace.cpp
+install_manifest.txt
+qapitrace
+traces
+wgltrace.cpp