Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update glutin to latest upstream merge

Browse source 
To pick up servo/glutin#47.
This commit is contained in:
Matt Brubeck 2015-09-17 22:33:11 -07:00
parent 83b364189c
commit 734513c668
2 changed files with 8 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

18
components/servo/Cargo.lock generated
View file

@ -639,16 +639,6 @@ dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "gl_generator"
version = "0.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"khronos_api 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"xml-rs 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "gl_generator"
version = "0.0.27"
@ -672,8 +662,8 @@ dependencies = [
[[package]]
name = "glutin"
version = "0.3.5"
source = "git+https://github.com/servo/glutin?branch=servo#1083121e586539760e2b1e9a99bbf3012e78fb98"
version = "0.3.6"
source = "git+https://github.com/servo/glutin?branch=servo#d415de427f765d65212ba56f3dcd1949c0c2fcd4"
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)",
@ -683,7 +673,7 @@ dependencies = [
"dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"gl_generator 0.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
"gl_generator 0.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
"kernel32-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"khronos_api 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
@ -711,7 +701,7 @@ dependencies = [
"egl 0.1.0 (git+https://github.com/servo/rust-egl)",
"euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"glutin 0.3.5 (git+https://github.com/servo/glutin?branch=servo)",
"glutin 0.3.6 (git+https://github.com/servo/glutin?branch=servo)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",

18
ports/cef/Cargo.lock generated
View file

@ -590,16 +590,6 @@ dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "gl_generator"
version = "0.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"khronos_api 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"xml-rs 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "gl_generator"
version = "0.0.27"
@ -623,8 +613,8 @@ dependencies = [
[[package]]
name = "glutin"
version = "0.3.5"
source = "git+https://github.com/servo/glutin?branch=servo#1083121e586539760e2b1e9a99bbf3012e78fb98"
version = "0.3.6"
source = "git+https://github.com/servo/glutin?branch=servo#d415de427f765d65212ba56f3dcd1949c0c2fcd4"
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)",
@ -634,7 +624,7 @@ dependencies = [
"dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"gl_generator 0.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
"gl_generator 0.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
"kernel32-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"khronos_api 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
@ -662,7 +652,7 @@ dependencies = [
"egl 0.1.0 (git+https://github.com/servo/rust-egl)",
"euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"glutin 0.3.5 (git+https://github.com/servo/glutin?branch=servo)",
"glutin 0.3.6 (git+https://github.com/servo/glutin?branch=servo)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",