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

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

diff --git a/.gitignore b/.gitignore
index 1c3d446..e48dd3b 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