Merge branch 'master' into multi-context

[apitrace] / .gitignore

diff --git a/.gitignore b/.gitignore
index 32ddb972723bec06dee86a28a9039005094a30dd..da02775279615a4e1c5d0a6e8ceb4fecebe7c598 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,35 +1,44 @@
 .*.sw?
-.scon*
 *~
 *.a
+*.bmp
 *.bz2
+*.cmake
 *.dll
+*.dylib
 *.exe
 *.exp
-*.trace
+*.gz
 *.ilk
+*.json
 *.lib
 *.o
 *.obj
 *.pdb
+*.png
 *.pyc
 *.pyo
 *.so
+*.trace
 *.zip
-CMakeFiles
+_CPack_Packages
 CMakeCache.txt
-cmake_install.cmake
+CMakeFiles
 Makefile
-MD5SUM
-config.log
-ddraw.cpp
-d3d8.cpp
-d3d9.cpp
+build
 d3d10.cpp
 d3d10_1.cpp
+d3d8.cpp
+d3d9.cpp
+ddraw.cpp
 dxsdk
-dump
-glx.cpp
+glproc.hpp
 glretrace
-glretrace.cpp
-opengl32.cpp
+glretrace_gl.cpp
+glretrace_state.cpp
+glxtrace.cpp
+install_manifest.txt
+qapitrace
+tracedump
+traces
+wgltrace.cpp