Auto merge of #12893 - servo:glutinup, r=metajack

Update glutin.  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12893)
servo · Aug 16, 2016 · e539155 · e539155
2 parents 2b74e94 + 028918d
commit e539155
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 28 deletions.
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
@@ -90,7 +90,7 @@ backtrace = "0.2"
 
 [target.'cfg(target_os = "android")'.dependencies]
 log = "0.3"
-android_glue = "0.1.3"
+android_glue = "0.2"
 
 [target.'cfg(not(target_os = "windows"))'.dependencies]
 gaol = {git = "https://github.com/servo/gaol"}
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml
@@ -18,7 +18,7 @@ log = "0.3.5"
 msg = {path = "../../components/msg"}
 net_traits = {path = "../../components/net_traits"}
 script_traits = {path = "../../components/script_traits"}
-servo-glutin = "0.5"
+servo-glutin = "0.6"
 style_traits = {path = "../../components/style_traits"}
 url = {version = "1.2", features = ["heap_size"]}
 util = {path = "../../components/util"}