aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-01-15 09:42:26 -0800
committerGitHub <noreply@github.com>2017-01-15 09:42:26 -0800
commit747e130295bc6dce8448a69bfdb01d2216f71738 (patch)
tree17083028faf93292e6d64e92f15798ee4df6e8b4
parentd09bf70d220262e2c199abf61b4b78b7137d6665 (diff)
parent3849fcdc8c5a0669d65a2061a42600f3d2cd8a72 (diff)
downloadservo-747e130295bc6dce8448a69bfdb01d2216f71738.tar.gz
servo-747e130295bc6dce8448a69bfdb01d2216f71738.zip
Auto merge of #15030 - glennw:update-wr-mac, r=Wafflespeanut
Update WR (version bump, mac fix). <!-- 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/15030) <!-- Reviewable:end -->
-rw-r--r--Cargo.lock12
1 files changed, 6 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 0c9db3cf71e..7de6118b6c9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -407,7 +407,7 @@ dependencies = [
"servo_url 0.0.1",
"style_traits 0.0.1",
"time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender 0.11.0 (git+https://github.com/servo/webrender)",
+ "webrender 0.11.1 (git+https://github.com/servo/webrender)",
"webrender_traits 0.11.0 (git+https://github.com/servo/webrender)",
]
@@ -1502,7 +1502,7 @@ dependencies = [
"style 0.0.1",
"url 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"webdriver_server 0.0.1",
- "webrender 0.11.0 (git+https://github.com/servo/webrender)",
+ "webrender 0.11.1 (git+https://github.com/servo/webrender)",
"webrender_traits 0.11.0 (git+https://github.com/servo/webrender)",
"webvr 0.0.1",
"webvr_traits 0.0.1",
@@ -3225,8 +3225,8 @@ dependencies = [
[[package]]
name = "webrender"
-version = "0.11.0"
-source = "git+https://github.com/servo/webrender#abb0df4bf794d07fa90b788bace6dd5b6b47ad24"
+version = "0.11.1"
+source = "git+https://github.com/servo/webrender#d19cf18d2957d706594ca3d6f31207c01b11d45d"
dependencies = [
"app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3252,7 +3252,7 @@ dependencies = [
[[package]]
name = "webrender_traits"
version = "0.11.0"
-source = "git+https://github.com/servo/webrender#abb0df4bf794d07fa90b788bace6dd5b6b47ad24"
+source = "git+https://github.com/servo/webrender#d19cf18d2957d706594ca3d6f31207c01b11d45d"
dependencies = [
"app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3631,7 +3631,7 @@ dependencies = [
"checksum wayland-sys 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9633f7fe5de56544215f82eaf1b76bf1b584becf7f08b58cbef4c2c7d10e803a"
"checksum wayland-window 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "309b69d3a863c9c21422d889fb7d98cf02f8a2ca054960a49243ce5b67ad884c"
"checksum webdriver 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b6a882a0a869b3c24ea501e1219c5385f0e085773ffbbc3217f8c2b720cb7b03"
-"checksum webrender 0.11.0 (git+https://github.com/servo/webrender)" = "<none>"
+"checksum webrender 0.11.1 (git+https://github.com/servo/webrender)" = "<none>"
"checksum webrender_traits 0.11.0 (git+https://github.com/servo/webrender)" = "<none>"
"checksum websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a1a6ea5ed0367f32eb3d94dcc58859ef4294b5f75ba983dbf56ac314af45d"
"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"