diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-08-31 16:58:07 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-08-31 16:58:07 -0600 |
| commit | dbf8c9d2bca87b3e9f656b72f2ac05f8688417ba (patch) | |
| tree | 986dead5c29ee88f917dc44c725a37419dc3fc9e | |
| parent | 7474b295104e75c013849e104704019dc4801c91 (diff) | |
| parent | f1aed3b2315a0620c9342234ed8af3c08335cb42 (diff) | |
| download | servo-dbf8c9d2bca87b3e9f656b72f2ac05f8688417ba.tar.gz servo-dbf8c9d2bca87b3e9f656b72f2ac05f8688417ba.zip | |
Auto merge of #7482 - glennw:glutin-update, r=larsbergstrom
Update glutin to get android build fix
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7482)
<!-- 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 0129277cbe8..0d01f48560c 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -628,7 +628,7 @@ dependencies = [ [[package]] name = "glutin" version = "0.3.5" -source = "git+https://github.com/servo/glutin?branch=servo#22a561c30a0560f445f50abcebf8439d264e0c67" +source = "git+https://github.com/servo/glutin?branch=servo#0b055f889ce0baaa0fc186da4f3b5c31b7c6fd18" dependencies = [ "android_glue 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index e12edccf063..a2365e9a784 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -620,7 +620,7 @@ dependencies = [ [[package]] name = "glutin" version = "0.3.5" -source = "git+https://github.com/servo/glutin?branch=servo#22a561c30a0560f445f50abcebf8439d264e0c67" +source = "git+https://github.com/servo/glutin?branch=servo#0b055f889ce0baaa0fc186da4f3b5c31b7c6fd18" dependencies = [ "android_glue 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", |