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 -->
This commit is contained in:
bors-servo 2015-05-19 13:10:44 -05:00
commit 0a737d90f2
2 changed files with 2 additions and 2 deletions

View file

@ -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)",

2
ports/cef/Cargo.lock generated
View file

@ -433,7 +433,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)",