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

[mesa.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 1c3d44665e0778ab94b271d26e680ca7c28be047..e48dd3b5318552928cf57bcad3ef8ee3e7cbaa6f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 *.ilk
 *.o
 *.obj
+*.os
 *.pc
 *.pdb
 *.pyc
@@ -24,3 +25,4 @@ cscope*
 .scon*
 config.py
 build
+.dir-locals.el