aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-02-15 13:43:43 -0800
committerGitHub <noreply@github.com>2017-02-15 13:43:43 -0800
commitab197de04f51f4bc2ed504b846e12a0abedf8f1f (patch)
tree6bec5b5168408f68282c5d44923b58c68da7012a
parent0bdc728f344f6134dba474e372b85427e1e4e86b (diff)
parentd901d61d34bdfd24251d7ae5c11c00cb9bf29690 (diff)
downloadservo-ab197de04f51f4bc2ed504b846e12a0abedf8f1f.tar.gz
servo-ab197de04f51f4bc2ed504b846e12a0abedf8f1f.zip
Auto merge of #15575 - glennw:update-wr-bug-fixes, r=nox
Update WR (image mask, vertex texture bug fixes). <!-- 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/15575) <!-- Reviewable:end -->
-rw-r--r--Cargo.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 148e2b63a20..a1e018113e8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3192,7 +3192,7 @@ dependencies = [
[[package]]
name = "webrender"
version = "0.15.0"
-source = "git+https://github.com/servo/webrender#3c05fd2fccc2b51ec8b1b12cb96b7d011468766c"
+source = "git+https://github.com/servo/webrender#938b32ca93bf5e878422ac4bafcdd53f8058f880"
dependencies = [
"app_units 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3220,7 +3220,7 @@ dependencies = [
[[package]]
name = "webrender_traits"
version = "0.14.0"
-source = "git+https://github.com/servo/webrender#3c05fd2fccc2b51ec8b1b12cb96b7d011468766c"
+source = "git+https://github.com/servo/webrender#938b32ca93bf5e878422ac4bafcdd53f8058f880"
dependencies = [
"app_units 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",