auto merge of #15867 : cmr/rust/rewrite-lexer4, r=alexcrichton

[rust.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 9ed279d9d74a28d66302a61bbf3a71ad60233f4d..bc34fc2dcdfbb5cc771b32dae4351fbb7d59857d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -60,7 +60,6 @@ config.mk
 /rt/
 /rustllvm/
 /test/
-/build
 /inst/
 /mingw-build/
 src/.DS_Store
@@ -85,7 +84,7 @@ config.stamp
 .DS_Store
 src/etc/dl
 .settings/
-build/
+/build
 i686-pc-mingw32/
-src/librustc/lib/llvmdeps.rs
+src/librustc_llvm/llvmdeps.rs
 *.pot