aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-08-03 12:42:47 -0500
committerGitHub <noreply@github.com>2016-08-03 12:42:47 -0500
commitef0f728f1eacb77d4ed82e35891bd77f0c882ff7 (patch)
tree412afd5788ef65b98d1867deb0c906348ff2f4f2
parent15947f8f73bc8145916e1213f559eede815d8529 (diff)
parent277464ccc9db61372dea0ef7e68077b58355fcb4 (diff)
downloadservo-ef0f728f1eacb77d4ed82e35891bd77f0c882ff7.tar.gz
servo-ef0f728f1eacb77d4ed82e35891bd77f0c882ff7.zip
Auto merge of #12716 - glennw:update-wr, r=larsbergstrom
Update WR to fix extra printlns. <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- 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/12716) <!-- Reviewable:end -->
-rw-r--r--components/servo/Cargo.lock2
-rw-r--r--ports/cef/Cargo.lock2
2 files changed, 2 insertions, 2 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 55e2ebc8d87..3d91b0b70d3 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -2554,7 +2554,7 @@ dependencies = [
[[package]]
name = "webrender"
version = "0.1.0"
-source = "git+https://github.com/servo/webrender#79b807160ea3c3cf558072813c51a59bbaccb8dd"
+source = "git+https://github.com/servo/webrender#b87a4c6a702742d73b34adc9a7d84a8577f8049f"
dependencies = [
"app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 9b6ea69083d..cfd46082f4a 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -2416,7 +2416,7 @@ dependencies = [
[[package]]
name = "webrender"
version = "0.1.0"
-source = "git+https://github.com/servo/webrender#79b807160ea3c3cf558072813c51a59bbaccb8dd"
+source = "git+https://github.com/servo/webrender#b87a4c6a702742d73b34adc9a7d84a8577f8049f"
dependencies = [
"app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",