Merge branch 'master' into d2d

[apitrace] / .gitignore

diff --git a/.gitignore b/.gitignore
index 55aae42576002273ab31dc717b45a29b7dd5f21b..89057b768b83236cf841158e9a38bd57888c211e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,51 @@
 .*.sw?
-.scons*
-*.obj
+*~
+*.7z
+*.a
+*.bmp
+*.bz2
+*.cmake
 *.dll
-*.lib
+*.dmg
+*.dylib
+*.exe
 *.exp
-*.xml
+*.gz
+*.ilk
+*.json
+*.lib
+*.o
+*.obj
+*.pdb
+*.png
+*.pnm
+*.pyc
+*.pyo
+*.so
+*.trace
+*.zip
+_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
+glstate_params.cpp
+glxtrace.cpp
+install_manifest.txt
+qapitrace
+traces
+wgltrace.cpp