diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-05-19 13:10:44 -0500 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-05-19 13:10:44 -0500 |
| commit | 0a737d90f2aafa5653d2ce1a5c5a809ebf4aa3a1 (patch) | |
| tree | 2ae0048c5a69da648b5709096c57d455e7054c2f /components | |
| parent | 40dded8b3a2e9eb9c0f0b7af189df27f3ad6414a (diff) | |
| parent | 5ce23cd36cb20539ff2219f2213cacbb8b08ae09 (diff) | |
| download | servo-0a737d90f2aafa5653d2ce1a5c5a809ebf4aa3a1.tar.gz servo-0a737d90f2aafa5653d2ce1a5c5a809ebf4aa3a1.zip | |
Auto merge of #6120 - zmike:cmap, r=larsbergstrom
@larsbergstrom
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6120)
<!-- Reviewable:end -->
Diffstat (limited to 'components')
| -rw-r--r-- | components/servo/Cargo.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 3202bcf3859..fc3bf6baa8b 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -431,7 +431,7 @@ dependencies = [ [[package]] name = "glutin" version = "0.0.26" -source = "git+https://github.com/servo/glutin?branch=servo#b28f35aa5b06e7d34ada307a5a1b1e9b9de697a1" +source = "git+https://github.com/servo/glutin?branch=servo#33f26a11d73cb4a3969059c57471f9f7b151dc1d" dependencies = [ "android_glue 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", |