Merge branch 'trace-editing'

[apitrace] / .gitignore

diff --git a/.gitignore b/.gitignore
index b79cb08e622225dcab7b681b3d39a473e225662d..cdd2823e2e126800af46bac36d29251704dffdd3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,39 @@
-*.obj
+.*.sw?
+*~
+*.a
+*.bmp
+*.bz2
 *.dll
-*.lib
+*.exe
 *.exp
-.scons*
+*.ilk
+*.json
+*.lib
+*.o
+*.obj
+*.pdb
+*.png
+*.pyc
+*.pyo
+*.so
+*.trace
+*.zip
+CMakeCache.txt
+CMakeFiles
+Makefile
+build
+cmake_install.cmake
+d3d10.cpp
+d3d10_1.cpp
+d3d8.cpp
+d3d9.cpp
+ddraw.cpp
+dxsdk
+glproc.hpp
+glretrace
+glretrace_gl.cpp
+glretrace_state.cpp
+glxtrace.cpp
+tracedump
+traces
+wgltrace.cpp