auto merge of #8357 : omasanori/rust/cleanup, r=alexcrichton

[rust.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index bfcdf15fd2fe080ec22045ba97e4890f7fd7ea57..eef182a12233dfc3d30a04257fad9ef03667b25c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,7 @@
 *.diff
 *.rej
 *.swp
+*.swo
 *.tmp
 *.pyc
 *.elc
@@ -49,6 +50,8 @@
 .valgrindrc
 lexer.ml
 TAGS
+TAGS.emacs
+TAGS.vim
 version.ml
 version.texi
 /Makefile
@@ -60,6 +63,7 @@ config.mk
 /inst/
 /mingw-build/
 src/.DS_Store
+/tmp/
 /stage0/
 /dl/
 /stage1/
@@ -69,14 +73,18 @@ src/.DS_Store
 /doc/html
 /doc/latex
 /doc/std
+/doc/extra
 /nd/
 /llvm/
 version.md
 rust.tex
 keywords.md
 x86_64-apple-darwin/
-doc/core/
+x86_64-unknown-linux-gnu/
+i686-unknown-linux-gnu/
 tmp.*.rs
 config.stamp
 .DS_Store
 src/etc/dl
+.settings/
+build/