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

[mesa.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index f43ff3766cbb4acdb56ddf05361e1d663f116922..e48dd3b5318552928cf57bcad3ef8ee3e7cbaa6f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ cscope*
 .scon*
 config.py
 build
+.dir-locals.el