diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-01-11 03:41:06 +0530 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-01-11 03:41:06 +0530 |
commit | 663ac945c1b09caa4d6c4576e7ab1bc2eb1b771a (patch) | |
tree | aa58c4b419693c53db6599ce135975539e58083f /components/script/script_thread.rs | |
parent | 85792d281964858d3a9ff4fa46e2c7cd8700c03f (diff) | |
parent | 57f8a1d7d680a72b71c7f5b750149901d1278c62 (diff) | |
download | servo-663ac945c1b09caa4d6c4576e7ab1bc2eb1b771a.tar.gz servo-663ac945c1b09caa4d6c4576e7ab1bc2eb1b771a.zip |
Auto merge of #9204 - connorimes:update-hb-energymon, r=Manishearth
Update heartbeats and energymon dependencies
Also aligns the heartbeats profiling script with current ProfilerCategory values.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9204)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/script_thread.rs')
0 files changed, 0 insertions, 0 deletions