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 /components/script/document_loader.rs | |
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 -->
Diffstat (limited to 'components/script/document_loader.rs')
0 files changed, 0 insertions, 0 deletions