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

Auto merge of #7471 - aweinstock314:update-clipboard-20150831, r=Manishearth

Browse source 
Prevent ClipboardContext::new from panicing on OSX if NSPasteboard#ge…

…neralPasteboard fails (https://github.com/servo/servo/issues/7380).

8c4c31e73a

<!-- 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 -->
This commit is contained in:
bors-servo 2015-08-31 07:22:06 -06:00
commit aee011a524
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/servo/Cargo.lock generated
View file

@ -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)",

2
ports/cef/Cargo.lock generated
View file

@ -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)",

2
ports/gonk/Cargo.lock generated
View file

@ -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)",