aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-08-30 00:36:34 -0500
committerGitHub <noreply@github.com>2016-08-30 00:36:34 -0500
commit8695552052074b0aacd764c28d2183f283e7b4fd (patch)
tree70a2011553abfd8928936a399f35a4ec075c1f15
parent3a715e5c55962fe88fcb53b4b79d0afe7a5f9003 (diff)
parentde813c3ce9be272853b844f9f555cb599deb427d (diff)
downloadservo-8695552052074b0aacd764c28d2183f283e7b4fd.tar.gz
servo-8695552052074b0aacd764c28d2183f283e7b4fd.zip
Auto merge of #13120 - glennw:update-wr-font-size, r=emilio
Update webrender with font size fix.
-rw-r--r--components/servo/Cargo.lock4
-rw-r--r--ports/cef/Cargo.lock4
2 files changed, 4 insertions, 4 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 9d436eff233..3acb51618b1 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -2591,7 +2591,7 @@ dependencies = [
[[package]]
name = "webrender"
version = "0.5.1"
-source = "git+https://github.com/servo/webrender#6d6ef896a6515e9d850643a9cbedd1e20bce3419"
+source = "git+https://github.com/servo/webrender#8cff5fd308b0d8db21c4008286685854107d25b7"
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)",
@@ -2616,7 +2616,7 @@ dependencies = [
[[package]]
name = "webrender_traits"
version = "0.5.1"
-source = "git+https://github.com/servo/webrender#6d6ef896a6515e9d850643a9cbedd1e20bce3419"
+source = "git+https://github.com/servo/webrender#8cff5fd308b0d8db21c4008286685854107d25b7"
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)",
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 1d41dde0822..6546afb20f2 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -2451,7 +2451,7 @@ dependencies = [
[[package]]
name = "webrender"
version = "0.5.1"
-source = "git+https://github.com/servo/webrender#6d6ef896a6515e9d850643a9cbedd1e20bce3419"
+source = "git+https://github.com/servo/webrender#8cff5fd308b0d8db21c4008286685854107d25b7"
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)",
@@ -2476,7 +2476,7 @@ dependencies = [
[[package]]
name = "webrender_traits"
version = "0.5.1"
-source = "git+https://github.com/servo/webrender#6d6ef896a6515e9d850643a9cbedd1e20bce3419"
+source = "git+https://github.com/servo/webrender#8cff5fd308b0d8db21c4008286685854107d25b7"
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)",