Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resync bindings #13200

Merged
merged 2 commits into from Sep 9, 2016
Merged

Resync bindings #13200

merged 2 commits into from Sep 9, 2016

Conversation

@Manishearth
Copy link
Member

Manishearth commented Sep 8, 2016

StyleClear and StyleDisplay are now enums, updating bindings for them.

r? @bholley


This change is Reviewable

@highfive
Copy link

highfive commented Sep 8, 2016

Heads up! This PR modifies the following files:

  • @bholley: components/style/properties/gecko.mako.rs, components/style/properties/longhand/box.mako.rs
@highfive
Copy link

highfive commented Sep 8, 2016

warning Warning warning

  • These commits modify style code, but no tests are modified. Please consider adding a test!
@bholley
Copy link
Contributor

bholley commented Sep 8, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Sep 8, 2016

📌 Commit 90f9297 has been approved by bholley

@bors-servo
Copy link
Contributor

bors-servo commented Sep 9, 2016

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

@Manishearth Manishearth force-pushed the Manishearth:resync branch from 90f9297 to a116125 Sep 9, 2016
@Manishearth
Copy link
Member Author

Manishearth commented Sep 9, 2016

@bors-servo r=bholley

@bors-servo
Copy link
Contributor

bors-servo commented Sep 9, 2016

📌 Commit a116125 has been approved by bholley

@bors-servo
Copy link
Contributor

bors-servo commented Sep 9, 2016

Testing commit a116125 with merge c2ff4d5...

bors-servo added a commit that referenced this pull request Sep 9, 2016
Resync bindings

StyleClear and StyleDisplay are now enums, updating bindings for them.

r? @bholley

<!-- 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/13200)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Sep 9, 2016

💔 Test failed - linux-dev

@Manishearth Manishearth force-pushed the Manishearth:resync branch from a116125 to 603c943 Sep 9, 2016
@Manishearth
Copy link
Member Author

Manishearth commented Sep 9, 2016

@bors-servo r=bholley

@bors-servo
Copy link
Contributor

bors-servo commented Sep 9, 2016

📌 Commit 603c943 has been approved by bholley

@bors-servo
Copy link
Contributor

bors-servo commented Sep 9, 2016

Testing commit 603c943 with merge 957893b...

bors-servo added a commit that referenced this pull request Sep 9, 2016
Resync bindings

StyleClear and StyleDisplay are now enums, updating bindings for them.

r? @bholley

<!-- 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/13200)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Sep 9, 2016

@bors-servo bors-servo merged commit 603c943 into servo:master Sep 9, 2016
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.