Merge remote-tracking branch 'origin/master' into pipe-video

[mesa.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index d519cab474beeb254b66cdac1feef8f0ebbe50b3..e48dd3b5318552928cf57bcad3ef8ee3e7cbaa6f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,16 @@
 *.a
+*.dll
+*.exe
+*.ilk
 *.o
+*.obj
+*.os
+*.pc
+*.pdb
 *.pyc
 *.pyo
 *.so
 *.sw[a-z]
-*.pc
 *~
 depend
 depend.bak
@@ -16,6 +22,7 @@ aclocal.m4
 config.log
 config.status
 cscope*
-.sconsign*
+.scon*
 config.py
 build
+.dir-locals.el