auto merge of #13693 : thestinger/rust/mem, r=alexcrichton

[rust.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index ac7c20db8cd6b2cbf82966cefdf626f9995479a2..9ed279d9d74a28d66302a61bbf3a71ad60233f4d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -60,29 +60,22 @@ config.mk
 /rt/
 /rustllvm/
 /test/
-/build/
+/build
 /inst/
 /mingw-build/
 src/.DS_Store
 /tmp/
+/dist/
 /stage0/
 /dl/
 /stage1/
 /stage2/
 /stage3/
 *.bz2
-/doc/html
-/doc/latex
-/doc/std
-/doc/extra
-/doc/green
-/doc/native
-/doc/rustc
-/doc/syntax
+/doc
 /nd/
 /llvm/
 version.md
-*.tex
 keywords.md
 x86_64-apple-darwin/
 x86_64-unknown-linux-gnu/
@@ -95,3 +88,4 @@ src/etc/dl
 build/
 i686-pc-mingw32/
 src/librustc/lib/llvmdeps.rs
+*.pot