Skip to content

Conversation

@changm
Copy link
Contributor

@changm changm commented Jan 30, 2017

This might be too much to review for now. Doh. Maybe easier to just review the single commit? a311e1d


This change is Reviewable

@changm changm requested a review from kvark January 30, 2017 22:20
@bors-servo
Copy link
Contributor

☔ The latest upstream changes (presumably #808) made this pull request unmergeable. Please resolve the merge conflicts.

Copy link
Member

@kvark kvark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, and sorry about the delay!
Looks fairly straightforward. Please rebase, and we'll proceed.

@changm
Copy link
Contributor Author

changm commented Jan 31, 2017

Will rebase after #798 -

Sorry, so many PRs just conflict upon each other so I'm gonna try to do one at a time instead of rebasing everyday.

@changm
Copy link
Contributor Author

changm commented Feb 3, 2017

@bors-servo retry . Build error due to CI issues.

@bors-servo
Copy link
Contributor

@changm: 🔑 Insufficient privileges: and not in try users

@changm
Copy link
Contributor Author

changm commented Feb 3, 2017

@kvark @glennw Can you tell bors-servo to retry please :(.

@kvark
Copy link
Member

kvark commented Feb 3, 2017

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 552a849 has been approved by kvark

@bors-servo
Copy link
Contributor

⌛ Testing commit 552a849 with merge bc45658...

bors-servo pushed a commit that referenced this pull request Feb 3, 2017
Pass GlyphKey to platform font contexts

This might be too much to review for now. Doh. Maybe easier to just review the single commit? a311e1d

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/811)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

☀️ Test successful - status-travis
Approved by: kvark
Pushing bc45658 to master...

@bors-servo bors-servo merged commit 552a849 into servo:master Feb 3, 2017
@changm changm deleted the glyph-key branch February 3, 2017 21:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants