Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-08 16:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #12731 - paulrouget:bhtmlupdate, r=nox

Browse source 
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 -->
This commit is contained in:
bors-servo 2016-08-04 05:33:40 -05:00 • committed by GitHub
commit 41cb4f4c77
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/servo/Cargo.lock generated
View file

@ -4,7 +4,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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 0.0.1",
"canvas_traits 0.0.1", "canvas_traits 0.0.1",
"compiletest_helper 0.0.1", "compiletest_helper 0.0.1",
@ -193,7 +193,7 @@ dependencies = [
[[package]] [[package]]
name = "browserhtml" name = "browserhtml"
version = "0.1.15" 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]] [[package]]
name = "byteorder" name = "byteorder"

2
components/servo/Cargo.toml
View file

@ -44,7 +44,7 @@ style_tests = {path = "../../tests/unit/style"}
util_tests = {path = "../../tests/unit/util"} util_tests = {path = "../../tests/unit/util"}
[dependencies] [dependencies]
browserhtml = {git = "https://github.com/browserhtml/browserhtml", branch = "gh-pages"} browserhtml = {git = "https://github.com/browserhtml/browserhtml", branch = "crate"}
canvas = {path = "../canvas"} canvas = {path = "../canvas"}
canvas_traits = {path = "../canvas_traits"} canvas_traits = {path = "../canvas_traits"}
compositing = {path = "../compositing"} compositing = {path = "../compositing"}

4
ports/cef/Cargo.lock generated
View file

@ -167,7 +167,7 @@ dependencies = [
[[package]] [[package]]
name = "browserhtml" name = "browserhtml"
version = "0.1.15" 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]] [[package]]
name = "byteorder" name = "byteorder"
@ -1885,7 +1885,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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 0.0.1",
"canvas_traits 0.0.1", "canvas_traits 0.0.1",
"compositing 0.0.1", "compositing 0.0.1",