diff options
| author | bors-servo <metajack+bors@gmail.com> | 2014-12-05 04:16:11 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2014-12-05 04:16:11 -0700 |
| commit | 6bd9bf979bcfa96ea14e666b59eab01a6d6c373e (patch) | |
| tree | 808dbcd833c2511c6075d2ef6eb34db55951e6d4 /components/layout/layout_task.rs | |
| parent | 66d4acef8d591b5516d99cb4c7dd9e379242b928 (diff) | |
| parent | 642e76668809f6b5a201bc8eb6fea7a4ccca9172 (diff) | |
| download | servo-6bd9bf979bcfa96ea14e666b59eab01a6d6c373e.tar.gz servo-6bd9bf979bcfa96ea14e666b59eab01a6d6c373e.zip | |
auto merge of #4198 : Manishearth/servo/hyper-droid, r=Manishearth
This is the Hyper pull request, plus the set up for OpenSSL on Android to make it merge.
Sean's commits have been reviewed in #4065 (My Android changes were reviewed by Glenn)
Diffstat (limited to 'components/layout/layout_task.rs')
0 files changed, 0 insertions, 0 deletions