diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-05-13 15:27:47 -0500 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-05-13 15:27:47 -0500 |
commit | a388a76d8238e6a009f4e62dbc930487adb96811 (patch) | |
tree | e0ae0aa56dec49d01c076e53d392c47adbc8efc5 /components/script/document_loader.rs | |
parent | c0ee952a2a7054dcc7e97990a625c281322dd526 (diff) | |
parent | d2133b2467893e7ab2ec7529ea00ccdffcd19ca3 (diff) | |
download | servo-a388a76d8238e6a009f4e62dbc930487adb96811.tar.gz servo-a388a76d8238e6a009f4e62dbc930487adb96811.zip |
Auto merge of #5995 - zmike:glutin-parenting, r=jdm
needed for embedding api usage
Depends on https://github.com/servo/glutin/pull/20
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5995)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/document_loader.rs')
0 files changed, 0 insertions, 0 deletions