Merge remote-tracking branch 'x86/froyo-x86' into froyo-next

[android-x86/external-mesa.git] / .gitignore

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