auto merge of #14546 : SimonSapin/rust/patch-13, r=alexcrichton

CC @alexcrichton
Closes #14545
This commit is contained in:
bors 2014-05-30 14:21:37 -07:00
commit 7e461eaeaa
1 changed files with 1 additions and 1 deletions

2
.gitignore vendored
View File

@ -84,7 +84,7 @@ config.stamp
.DS_Store
src/etc/dl
.settings/
build/
/build
i686-pc-mingw32/
src/librustc/lib/llvmdeps.rs
*.pot