aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-03-17 02:55:41 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2016-03-17 02:55:41 +0530
commitb7304f11529f92b4b08b5bac59a16c331c6ee774 (patch)
treef70dd216c37c1fdeeedc8b94627d1a815e2bd520
parent909ff4446a8197490af7f2af213dfa2ac35ae0a6 (diff)
parent7df52a0144c8ae9282223091bb17373f393cebe0 (diff)
downloadservo-b7304f11529f92b4b08b5bac59a16c331c6ee774.tar.gz
servo-b7304f11529f92b4b08b5bac59a16c331c6ee774.zip
Auto merge of #10037 - pcwalton:update-glutin, r=mbrubeck
servo: Update Glutin. Closes #9855. Closes #9878. r? @mbrubeck <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10037) <!-- Reviewable:end -->
-rw-r--r--components/servo/Cargo.lock6
-rw-r--r--ports/cef/Cargo.lock6
-rw-r--r--ports/gonk/Cargo.lock4
3 files changed, 8 insertions, 8 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index fdb33887239..0190a6a604c 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -788,7 +788,7 @@ dependencies = [
"net_traits 0.0.1",
"script_traits 0.0.1",
"servo-egl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "servo-glutin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "servo-glutin 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
"style_traits 0.0.1",
"url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
@@ -1856,7 +1856,7 @@ dependencies = [
[[package]]
name = "servo-glutin"
-version = "0.4.10"
+version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1898,7 +1898,7 @@ dependencies = [
"servo-egl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"servo-fontconfig 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"servo-freetype-sys 2.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "servo-glutin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "servo-glutin 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
"x11 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index d22e144fe0c..b880d765609 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -708,7 +708,7 @@ dependencies = [
"net_traits 0.0.1",
"script_traits 0.0.1",
"servo-egl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "servo-glutin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "servo-glutin 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
"style_traits 0.0.1",
"url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
@@ -1760,7 +1760,7 @@ dependencies = [
[[package]]
name = "servo-glutin"
-version = "0.4.10"
+version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1802,7 +1802,7 @@ dependencies = [
"servo-egl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"servo-fontconfig 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"servo-freetype-sys 2.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "servo-glutin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "servo-glutin 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
"x11 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index 244ce3530c8..079706df287 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -1740,7 +1740,7 @@ dependencies = [
[[package]]
name = "servo-glutin"
-version = "0.4.10"
+version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1782,7 +1782,7 @@ dependencies = [
"servo-egl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"servo-fontconfig 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"servo-freetype-sys 2.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "servo-glutin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "servo-glutin 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
"x11 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
]