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

auto merge of #4052 : glennw/servo/update-glutin, r=larsbergstrom

Browse source 
- Update glutin, and update rust-cocoa to use the servo fork now that upstream is up to date.
- Some events and resizing are still not working correctly on mac yet.
This commit is contained in:
bors-servo 2014-11-21 08:51:31 -07:00
commit b4c3aec383
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Cargo.lock generated
View file

@ -60,7 +60,7 @@ dependencies = [
[[package]] [[package]]
name = "cocoa" name = "cocoa"
version = "0.1.1" version = "0.1.1"
source = "git+https://github.com/DavidPartouche/rust-cocoa#0a951a6cdd5f1a175b929754c134f9443b105642" source = "git+https://github.com/servo/rust-cocoa#78b823bec1affcab20b6977e1057125088a6034c"
[[package]] [[package]]
name = "compile_msg" name = "compile_msg"
@ -292,10 +292,10 @@ dependencies = [
[[package]] [[package]]
name = "glutin" name = "glutin"
version = "0.0.2" version = "0.0.2"
source = "git+https://github.com/tomaka/glutin#0dc5086efb29e84c48cd4dcc1da48ee9755842e3" source = "git+https://github.com/tomaka/glutin#c95b778e2c077c0b410f366ad3c85a93c40c6095"
dependencies = [ dependencies = [
"android_glue 0.0.1 (git+https://github.com/tomaka/android-rs-glue)", "android_glue 0.0.1 (git+https://github.com/tomaka/android-rs-glue)",
"cocoa 0.1.1 (git+https://github.com/DavidPartouche/rust-cocoa)", "cocoa 0.1.1 (git+https://github.com/servo/rust-cocoa)",
"compile_msg 0.1.1 (git+https://github.com/huonw/compile_msg)", "compile_msg 0.1.1 (git+https://github.com/huonw/compile_msg)",
"core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)", "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
"gl_common 0.0.1 (git+https://github.com/bjz/gl-rs.git)", "gl_common 0.0.1 (git+https://github.com/bjz/gl-rs.git)",