Merge branch 'trace-editing'

[apitrace] / .gitignore

diff --git a/.gitignore b/.gitignore
index c65bc087035361eed3c120116838e0a6bd20a70a..cdd2823e2e126800af46bac36d29251704dffdd3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,15 +6,17 @@
 *.dll
 *.exe
 *.exp
-*.trace
 *.ilk
+*.json
 *.lib
 *.o
 *.obj
 *.pdb
+*.png
 *.pyc
 *.pyo
 *.so
+*.trace
 *.zip
 CMakeCache.txt
 CMakeFiles
@@ -26,10 +28,12 @@ d3d10_1.cpp
 d3d8.cpp
 d3d9.cpp
 ddraw.cpp
-dump
 dxsdk
 glproc.hpp
 glretrace
-glretrace.cpp
+glretrace_gl.cpp
+glretrace_state.cpp
 glxtrace.cpp
+tracedump
+traces
 wgltrace.cpp