diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-07-18 18:46:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-18 18:46:14 -0700 |
| commit | 877e480c47fabf400cfa2275aada9d6d9c678b9a (patch) | |
| tree | 20dc1e64693055037a6aa40485a436375465af00 | |
| parent | 589c6eeb0fc8e10cd82215a287fa23c676898907 (diff) | |
| parent | 509d77970399e2b4eee644dfc8b7473a80c7dbdf (diff) | |
| download | servo-877e480c47fabf400cfa2275aada9d6d9c678b9a.tar.gz servo-877e480c47fabf400cfa2275aada9d6d9c678b9a.zip | |
Auto merge of #12497 - glennw:wr-update, r=emilio
Update WR to get fix for texture atlas assert.
<!-- 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/12497)
<!-- Reviewable:end -->
| -rw-r--r-- | components/servo/Cargo.lock | 2 | ||||
| -rw-r--r-- | ports/cef/Cargo.lock | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index da1d71b5544..e8db00d2aa6 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -2591,7 +2591,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.1.0" -source = "git+https://github.com/servo/webrender#29fcb362a71b0434db186db7e7b9fa8349a0dc3a" +source = "git+https://github.com/servo/webrender#fd38ab8994be39ba194f56182af8c467b4f9f929" 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 dc270a4081f..26e0b902f4c 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -2453,7 +2453,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.1.0" -source = "git+https://github.com/servo/webrender#29fcb362a71b0434db186db7e7b9fa8349a0dc3a" +source = "git+https://github.com/servo/webrender#fd38ab8994be39ba194f56182af8c467b4f9f929" 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)", |