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

[mesa.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 9edd6daf71c5df3799189cdd4ca71b09c97e2af4..e48dd3b5318552928cf57bcad3ef8ee3e7cbaa6f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,28 @@
-.deps
-COPYING
-INSTALL
-Makefile.in
-aclocal.m4
-autom4te.cache
-config.*
-configure
-depcomp
-ylwrap
-install-sh
-missing
-stamp-h1
-Makefile
+*.a
+*.dll
+*.exe
+*.ilk
 *.o
+*.obj
+*.os
+*.pc
+*.pdb
+*.pyc
+*.pyo
+*.so
+*.sw[a-z]
 *~
-glsl_lexer.cpp
-glsl_parser.output
-glsl_parser.cpp
-glsl_parser.h
-glsl
+depend
+depend.bak
+lib
+lib64
+configure
+autom4te.cache
+aclocal.m4
+config.log
+config.status
+cscope*
+.scon*
+config.py
+build
+.dir-locals.el