1
Fork 0

auto merge of #15610 : brson/rust/0.12.0, r=alexcrichton

This commit is contained in:
bors 2014-07-12 18:06:36 +00:00
commit f2d251d12e
53 changed files with 53 additions and 54 deletions

View file

@ -102,7 +102,7 @@
#![crate_type = "dylib"]
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://doc.rust-lang.org/0.11.0/",
html_root_url = "http://doc.rust-lang.org/master/",
html_playground_url = "http://play.rust-lang.org/")]
#![feature(macro_rules, globs, managed_boxes, linkage)]