X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=.gitignore;h=e48dd3b5318552928cf57bcad3ef8ee3e7cbaa6f;hb=refs%2Fheads%2Ffroyo-x86;hp=1c3d44665e0778ab94b271d26e680ca7c28be047;hpb=4df482086ebf0663c708b089d8d8d22de0ef972c;p=android-x86%2Fexternal-mesa.git

diff --git a/.gitignore b/.gitignore
index 1c3d44665e0..e48dd3b5318 100644
--- 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