diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-02-11 17:24:45 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-02-11 17:24:45 -0700 |
| commit | 2cc08f289ab909de44fa09a07b2c43b70ce379b9 (patch) | |
| tree | 0c243afe9d7d82695d16bd43d72e88600e4414ef /components/net/lib.rs | |
| parent | bc6882bdefc318402a46ede1494eb79339705c21 (diff) | |
| parent | d5dd1d658e5d79701fb9d028479a0fcb26a033fa (diff) | |
| download | servo-2cc08f289ab909de44fa09a07b2c43b70ce379b9.tar.gz servo-2cc08f289ab909de44fa09a07b2c43b70ce379b9.zip | |
auto merge of #4893 : servo/servo/rustup_2015-01-31, r=Ms2ger,glennw
Ready for review.
Final link step on android fails, but we know how to fix it and will add it to this branch soon.
Diffstat (limited to 'components/net/lib.rs')
| -rw-r--r-- | components/net/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/net/lib.rs b/components/net/lib.rs index c42179e749f..4beb588047c 100644 --- a/components/net/lib.rs +++ b/components/net/lib.rs @@ -17,7 +17,7 @@ extern crate png; #[macro_use] extern crate log; extern crate openssl; -extern crate "rustc-serialize" as rustc_serialize; +extern crate "rustc-serialize" as serialize; extern crate util; extern crate stb_image; extern crate time; |