Skip to content

Commit

Permalink
auto merge of rust-lang#878 : alexcrichton/cargo/update-curl, r=brson
Browse files Browse the repository at this point in the history
  • Loading branch information
bors committed Nov 15, 2014
2 parents 56852db + 6f872f5 commit 0202646
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
14 changes: 7 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ git = "https://github.com/servo/rust-url"
git = "https://github.com/rust-lang/semver"

[dependencies.curl]
git = "https://github.com/alexcrichton/curl-rust"
branch = "build-cmd"
git = "https://github.com/carllerche/curl-rust"

[dependencies.tar]
git = "https://github.com/alexcrichton/tar-rs"
Expand Down
3 changes: 1 addition & 2 deletions src/registry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ name = "registry"
path = "lib.rs"

[dependencies.curl]
git = "https://github.com/alexcrichton/curl-rust"
branch = "build-cmd"
git = "https://github.com/carllerche/curl-rust"

0 comments on commit 0202646

Please sign in to comment.