Merge branch 'trace-editing'

[apitrace] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3673b5220f9392448f594798a4ce07b2ad5a665c..cdd2823e2e126800af46bac36d29251704dffdd3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,8 +6,8 @@
 *.dll
 *.exe
 *.exp
-*.trace
 *.ilk
+*.json
 *.lib
 *.o
 *.obj
@@ -16,6 +16,7 @@
 *.pyc
 *.pyo
 *.so
+*.trace
 *.zip
 CMakeCache.txt
 CMakeFiles
@@ -27,11 +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