diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-01-05 14:36:57 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-01-05 14:36:57 -0700 |
| commit | 3c45973238eab6f85fcc5184e3edf7ad010428f8 (patch) | |
| tree | 17efd61b4b46263204db7e217a8cb28cef021284 | |
| parent | 3639c4e9818c5421659827b1da1844a9bbb792be (diff) | |
| parent | 1b6aade4912453f2ab4b301434a04b2dbc81bb48 (diff) | |
| download | servo-3c45973238eab6f85fcc5184e3edf7ad010428f8.tar.gz servo-3c45973238eab6f85fcc5184e3edf7ad010428f8.zip | |
auto merge of #4552 : glennw/servo/update-glutin-cocoa, r=metajack
| -rw-r--r-- | components/servo/Cargo.lock | 4 | ||||
| -rw-r--r-- | ports/cef/Cargo.lock | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index b92f7ea77ce..c9e98390961 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "cocoa" version = "0.1.1" -source = "git+https://github.com/servo/rust-cocoa#8f47f126fe534d4dad86aa1f5b2da46a0581a232" +source = "git+https://github.com/servo/rust-cocoa#bf53a53ce306279fc1cae0d56fdd5e7216696420" [[package]] name = "compile_msg" @@ -330,7 +330,7 @@ dependencies = [ [[package]] name = "glutin" version = "0.0.2" -source = "git+https://github.com/servo/glutin?ref=servo#4b1039622fab13fed23e111a35e65e5186540808" +source = "git+https://github.com/servo/glutin?ref=servo#447b6e4132b09018bbfabe5035e4ab932a5c24be" dependencies = [ "android_glue 0.0.1 (git+https://github.com/servo/android-rs-glue?ref=servo)", "cocoa 0.1.1 (git+https://github.com/servo/rust-cocoa)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index e203988b28b..2f75cd5447f 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -60,7 +60,7 @@ dependencies = [ [[package]] name = "cocoa" version = "0.1.1" -source = "git+https://github.com/servo/rust-cocoa#8f47f126fe534d4dad86aa1f5b2da46a0581a232" +source = "git+https://github.com/servo/rust-cocoa#bf53a53ce306279fc1cae0d56fdd5e7216696420" [[package]] name = "compositing" @@ -697,6 +697,7 @@ dependencies = [ "cssparser 0.1.0 (git+https://github.com/servo/rust-cssparser)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", + "plugins 0.0.1", "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", "string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache)", "task_info 0.0.1", |