diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-06-17 10:16:27 -0600 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-06-17 10:16:27 -0600 |
commit | ee54c89e3f801dcd90a494c65ff8cfd975a6be6f (patch) | |
tree | a7b7155e02ca6d7c1c852cd01ba025f13fd68191 /components/script/dom/htmlcanvaselement.rs | |
parent | ee22ae263515c2804b739ead4c02bc7333c3965c (diff) | |
parent | 22c06307b8a55ae3ce7393d9770918f74ac5e0d8 (diff) | |
download | servo-ee54c89e3f801dcd90a494c65ff8cfd975a6be6f.tar.gz servo-ee54c89e3f801dcd90a494c65ff8cfd975a6be6f.zip |
Auto merge of #6401 - jgraham:load_timeout, r=metajack
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6401)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/htmlcanvaselement.rs')
0 files changed, 0 insertions, 0 deletions