diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-12-28 21:19:26 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-28 21:19:26 -0800 |
commit | 49bdef98bff28771b189073f5f0d487fe9529b86 (patch) | |
tree | 139f98b2bfee0b11f568366d54d568d3ea996382 /components/script/script_thread.rs | |
parent | c6ea1ec91f4a0b79b4fcdfa05a9b492fa6c9a798 (diff) | |
parent | 77bc2e0ba3944add8d55a680c8915e9fdcae03b3 (diff) | |
download | servo-49bdef98bff28771b189073f5f0d487fe9529b86.tar.gz servo-49bdef98bff28771b189073f5f0d487fe9529b86.zip |
Auto merge of #14771 - upsuper:text-combine-upright, r=Wafflespeanut
Add support of text-combine-upright for stylo
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because it is just a trivial change for stylo only
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14771)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/script_thread.rs')
0 files changed, 0 insertions, 0 deletions