diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-08-16 09:38:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-16 09:38:37 -0400 |
| commit | 6a637ceffbe34474ea4b657b08acc0966dc8a088 (patch) | |
| tree | fdd756dfa9a256a89f918808f313c22e4b698072 /components/script_traits/lib.rs | |
| parent | aa600775638c93be7148b2386f318bbc2ed09344 (diff) | |
| parent | 9a2ba596e5c3576b85458ecb347b39f636359ba3 (diff) | |
| download | servo-6a637ceffbe34474ea4b657b08acc0966dc8a088.tar.gz servo-6a637ceffbe34474ea4b657b08acc0966dc8a088.zip | |
Auto merge of #23976 - asajeffrey:magicleap-monompk, r=jdm
Package both Servo2D and Servo3D in one magicleap mpk
<!-- Please describe your changes on the following line: -->
Put both magicleap apps in one mpk archive.
---
<!-- 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
- [X] These changes do not require tests because we don't test native packaging
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- 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/23976)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script_traits/lib.rs')
0 files changed, 0 insertions, 0 deletions