diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-08-31 07:22:06 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-08-31 07:22:06 -0600 |
| commit | aee011a524c096d7535bb95a1e76a1586784aeb8 (patch) | |
| tree | dcd0dfd383709bfc086945c50ed03ff3845c3b61 | |
| parent | fea36ceb9a2d5114e41ce9067911b01f8e4fa5fd (diff) | |
| parent | fd4147fe7c36e814230ea0b0c46788d88ec7f549 (diff) | |
| download | servo-aee011a524c096d7535bb95a1e76a1586784aeb8.tar.gz servo-aee011a524c096d7535bb95a1e76a1586784aeb8.zip | |
Auto merge of #7471 - aweinstock314:update-clipboard-20150831, r=Manishearth
Prevent ClipboardContext::new from panicing on OSX if NSPasteboard#ge…
…neralPasteboard fails (https://github.com/servo/servo/issues/7380).
https://github.com/aweinstock314/rust-clipboard/commit/8c4c31e73a5ac5afd97825acc4c534dccfc0ab9b
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7471)
<!-- Reviewable:end -->
| -rw-r--r-- | components/servo/Cargo.lock | 2 | ||||
| -rw-r--r-- | ports/cef/Cargo.lock | 2 | ||||
| -rw-r--r-- | ports/gonk/Cargo.lock | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 4f21ac4c668..0129277cbe8 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -169,7 +169,7 @@ dependencies = [ [[package]] name = "clipboard" version = "0.0.3" -source = "git+https://github.com/aweinstock314/rust-clipboard#b0092c8630d4362e4618533822bea90a034b0792" +source = "git+https://github.com/aweinstock314/rust-clipboard#8c4c31e73a5ac5afd97825acc4c534dccfc0ab9b" dependencies = [ "clipboard-win 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 892fc84f5af..e12edccf063 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -168,7 +168,7 @@ dependencies = [ [[package]] name = "clipboard" version = "0.0.3" -source = "git+https://github.com/aweinstock314/rust-clipboard#b0092c8630d4362e4618533822bea90a034b0792" +source = "git+https://github.com/aweinstock314/rust-clipboard#8c4c31e73a5ac5afd97825acc4c534dccfc0ab9b" dependencies = [ "clipboard-win 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 94865e85c78..0f810c0de64 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -149,7 +149,7 @@ dependencies = [ [[package]] name = "clipboard" version = "0.0.3" -source = "git+https://github.com/aweinstock314/rust-clipboard#b0092c8630d4362e4618533822bea90a034b0792" +source = "git+https://github.com/aweinstock314/rust-clipboard#8c4c31e73a5ac5afd97825acc4c534dccfc0ab9b" dependencies = [ "clipboard-win 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", |