about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-05-25 03:26:00 -0700
committerbors <bors@rust-lang.org>2013-05-25 03:26:00 -0700
commit6e65a3fa152d67046f1962b06e1462035fc3b8f4 (patch)
tree7d567e3a71132acb84d2baabaa414097f57a4c73
parentb238a0872507293b2650f6d225ef94071bd53f54 (diff)
parent257192c69e08c174753e1abe7efd53c3a87ed92e (diff)
downloadrust-6e65a3fa152d67046f1962b06e1462035fc3b8f4.tar.gz
rust-6e65a3fa152d67046f1962b06e1462035fc3b8f4.zip
auto merge of #6734 : huonw/rust/gitignore, r=thestinger
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 7ef656055ec..eef182a1223 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,6 +73,7 @@ src/.DS_Store
 /doc/html
 /doc/latex
 /doc/std
+/doc/extra
 /nd/
 /llvm/
 version.md
@@ -81,7 +82,6 @@ keywords.md
 x86_64-apple-darwin/
 x86_64-unknown-linux-gnu/
 i686-unknown-linux-gnu/
-doc/core/
 tmp.*.rs
 config.stamp
 .DS_Store