diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-09-19 21:47:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-19 21:47:40 -0500 |
| commit | f313beee9bf70a73d1b0d06b1e36e67ad9e28deb (patch) | |
| tree | 5529c778e7103ec96004d22b30de18d9f42323f2 /components | |
| parent | 993fbc4320e6429c3edb43c9c5a3221a801f6f6f (diff) | |
| parent | 7c8664e6ec30c311f1aaa79f80fcc5732799a543 (diff) | |
| download | servo-f313beee9bf70a73d1b0d06b1e36e67ad9e28deb.tar.gz servo-f313beee9bf70a73d1b0d06b1e36e67ad9e28deb.zip | |
Auto merge of #13330 - glennw:update-wr-prim-cache, r=pcwalton
Update webrender (prim cache changes, blend/composite shaders).
<!-- 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/13330)
<!-- Reviewable:end -->
Diffstat (limited to 'components')
| -rw-r--r-- | components/servo/Cargo.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index da5fd990bd8..647b62e58ae 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -2643,7 +2643,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.5.1" -source = "git+https://github.com/servo/webrender#37dab545df3a9b6aa5e762f59272eb3d37227476" +source = "git+https://github.com/servo/webrender#61b8f8bfefd472bd71dd9a06c1d16dab28c1fcc0" 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)", @@ -2668,7 +2668,7 @@ dependencies = [ [[package]] name = "webrender_traits" version = "0.5.1" -source = "git+https://github.com/servo/webrender#37dab545df3a9b6aa5e762f59272eb3d37227476" +source = "git+https://github.com/servo/webrender#61b8f8bfefd472bd71dd9a06c1d16dab28c1fcc0" 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)", |