Merge branch 'trace-editing'

[apitrace] / .gitignore

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