diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-09-03 23:56:55 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-03 23:56:55 -0500 |
commit | fe9d9096ec3e78e2d5d53d32f181dc519512a40a (patch) | |
tree | e75459c1f86dcfb506f97c953a8f9677dd58c11a /components/script/parse/xml.rs | |
parent | 1fd745a4084c28039746d63c81d49120199dcad4 (diff) | |
parent | e8d7184659392a9d64a4b9aa97f87fe88bd1e95c (diff) | |
download | servo-fe9d9096ec3e78e2d5d53d32f181dc519512a40a.tar.gz servo-fe9d9096ec3e78e2d5d53d32f181dc519512a40a.zip |
Auto merge of #13171 - emilio:mako-is-back, r=SimonSapin
Revert "Remove mako.zip"
<!-- Please describe your changes on the following line: -->
Stylo doesn't use Servo's virtualenv, so we need to integrate it into Gecko's build before doing this.
---
<!-- 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
<!-- Either: -->
- [x] There are tests for these changes OR
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
This reverts commit 95e3f8333a116f9bd62fb071d08fcef269697804.
<!-- 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/13171)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/parse/xml.rs')
0 files changed, 0 insertions, 0 deletions