diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-08-04 05:33:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-04 05:33:40 -0500 |
| commit | 41cb4f4c77e8873a291218284db41118da43f708 (patch) | |
| tree | 280185971d6f4818d83c78920b3360ae5065e5dd | |
| parent | 54b3668431fb1d817b9988f24ad9ce7bf17b3f55 (diff) | |
| parent | f68abd972132a0891853d47e91d011f0ae50ed73 (diff) | |
| download | servo-41cb4f4c77e8873a291218284db41118da43f708.tar.gz servo-41cb4f4c77e8873a291218284db41118da43f708.zip | |
Auto merge of #12731 - paulrouget:bhtmlupdate, r=nox
Browserhtml update
We also changed the branch name.
Fix #12012
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12731)
<!-- Reviewable:end -->
| -rw-r--r-- | components/servo/Cargo.lock | 4 | ||||
| -rw-r--r-- | components/servo/Cargo.toml | 2 | ||||
| -rw-r--r-- | ports/cef/Cargo.lock | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index a5970caa2e1..599a7697656 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -4,7 +4,7 @@ version = "0.0.1" dependencies = [ "android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "browserhtml 0.1.15 (git+https://github.com/browserhtml/browserhtml?branch=gh-pages)", + "browserhtml 0.1.15 (git+https://github.com/browserhtml/browserhtml?branch=crate)", "canvas 0.0.1", "canvas_traits 0.0.1", "compiletest_helper 0.0.1", @@ -193,7 +193,7 @@ dependencies = [ [[package]] name = "browserhtml" version = "0.1.15" -source = "git+https://github.com/browserhtml/browserhtml?branch=gh-pages#48eed1856f8bf49ccf3f60e25d871e1654d67f22" +source = "git+https://github.com/browserhtml/browserhtml?branch=crate#702f464d198481476363693315085d37b8e305b7" [[package]] name = "byteorder" diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index 9a809f5148b..7af0f577119 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -44,7 +44,7 @@ style_tests = {path = "../../tests/unit/style"} util_tests = {path = "../../tests/unit/util"} [dependencies] -browserhtml = {git = "https://github.com/browserhtml/browserhtml", branch = "gh-pages"} +browserhtml = {git = "https://github.com/browserhtml/browserhtml", branch = "crate"} canvas = {path = "../canvas"} canvas_traits = {path = "../canvas_traits"} compositing = {path = "../compositing"} diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index c62f65a1022..e432c544ca4 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -167,7 +167,7 @@ dependencies = [ [[package]] name = "browserhtml" version = "0.1.15" -source = "git+https://github.com/browserhtml/browserhtml?branch=gh-pages#48eed1856f8bf49ccf3f60e25d871e1654d67f22" +source = "git+https://github.com/browserhtml/browserhtml?branch=crate#702f464d198481476363693315085d37b8e305b7" [[package]] name = "byteorder" @@ -1885,7 +1885,7 @@ version = "0.0.1" dependencies = [ "android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "browserhtml 0.1.15 (git+https://github.com/browserhtml/browserhtml?branch=gh-pages)", + "browserhtml 0.1.15 (git+https://github.com/browserhtml/browserhtml?branch=crate)", "canvas 0.0.1", "canvas_traits 0.0.1", "compositing 0.0.1", |