diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-01-14 10:27:52 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-01-14 10:27:52 +0530 |
| commit | 42372dbdf112c1c2967c4487401b28e7305c2993 (patch) | |
| tree | 4d0c9bf464a19ea057e652b3f7f2de77cb25d112 /python/servo/__init__.py | |
| parent | 9c713cb4688f1a1729ada64846fac2d8426b1ef4 (diff) | |
| parent | a450c8f67b37090d66e0c9e47d90bec9446c0571 (diff) | |
| download | servo-42372dbdf112c1c2967c4487401b28e7305c2993.tar.gz servo-42372dbdf112c1c2967c4487401b28e7305c2993.zip | |
Auto merge of #9299 - antrik:update-ipc_channel, r=pcwalton
cargo-update ipc-channel to get important fixes
This pulls in https://github.com/servo/ipc-channel/pull/25 and
https://github.com/servo/ipc-channel/pull/27, thus fixing fallout from
the multiprocess split, and making Servo work on my system again.
(It also pulls in https://github.com/servo/ipc-channel/pull/12 -- I
guess that's fine?)
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9299)
<!-- Reviewable:end -->
Diffstat (limited to 'python/servo/__init__.py')
0 files changed, 0 insertions, 0 deletions