servo: Merge #7471 - Prevent ClipboardContext::new from panicing on OSX if NSPasteboard#ge… (from aweinstock314:update-clipboard-20150831); r=Manishearth

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

8c4c31e73a

Source-Repo: https://github.com/servo/servo
Source-Revision: aee011a524c096d7535bb95a1e76a1586784aeb8
This commit is contained in:
Avi Weinstock 2015-08-31 07:22:06 -06:00
parent a6ba5f48c0
commit d73f17c92b
3 changed files with 3 additions and 3 deletions

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

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

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