Skip to content

/ servo

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

Update webrender, copy new shaders, pin ipc-channel. #12711

Merged
merged 4 commits into from Aug 3, 2016
Merged

Update webrender, copy new shaders, pin ipc-channel. #12711

merged 4 commits into from Aug 3, 2016

Conversation

@Ms2ger
Copy link
Contributor

Ms2ger commented Aug 3, 2016 •
edited by larsbergstrom

This change is Reviewable
@highfive
Copy link

highfive commented Aug 3, 2016

Heads up! This PR modifies the following files:

  • @asajeffrey: components/webdriver_server/Cargo.toml, components/constellation/Cargo.toml
  • @jgraham: components/webdriver_server/Cargo.toml
  • @fitzgen: components/devtools_traits/Cargo.toml, components/devtools_traits/Cargo.toml, components/profile/Cargo.toml, components/profile_traits/Cargo.toml, components/profile_traits/Cargo.toml, components/devtools/Cargo.toml
  • @KiChjang: components/script/Cargo.toml, components/script_traits/Cargo.toml, components/script_traits/Cargo.toml, components/net/Cargo.toml, components/script_layout_interface/Cargo.toml, components/net_traits/Cargo.toml, components/net_traits/Cargo.toml
@Ms2ger Ms2ger mentioned this pull request Aug 3, 2016
Closed
0 of 5 tasks complete
gw3583 added 3 commits Aug 1, 2016
@gw3583 @Ms2ger
Add wr-debug option.
e5f183a
@gw3583 @Ms2ger
Copy shaders from WR repo.
2ebf861
@gw3583 @Ms2ger
Copy fixed box-shadow shader.
c349e4b
@Ms2ger Ms2ger force-pushed the wr-wr-next branch from e443e41 to bd6a0ac Aug 3, 2016
@gw3583 @Ms2ger
Update cargo.lock for wr2, pin ipc-channel.
Loading status checks…
db8c3ef
@Ms2ger Ms2ger force-pushed the wr-wr-next branch from bd6a0ac to db8c3ef Aug 3, 2016
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Aug 3, 2016

@bors-servo try
bors-servo added a commit that referenced this pull request Aug 3, 2016
@bors-servo
Auto merge of #12711 - servo:wr-wr-next, r=<try>
Loading status checks…
0f9331c 
Update webrender, copy new shaders, pin ipc-channel.

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

bors-servo commented Aug 3, 2016

⌛ Trying commit db8c3ef with merge 0f9331c...
@bors-servo
Copy link
Contributor

bors-servo commented Aug 3, 2016

☀️ Test successful - arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows-dev
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Aug 3, 2016

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Aug 3, 2016

📌 Commit db8c3ef has been approved by Ms2ger
@highfive highfive assigned Ms2ger and unassigned wafflespeanut Aug 3, 2016
bors-servo added a commit that referenced this pull request Aug 3, 2016
@bors-servo
Auto merge of #12711 - servo:wr-wr-next, r=Ms2ger
Loading status checks…
e2d4ff5 
Update webrender, copy new shaders, pin ipc-channel.

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

bors-servo commented Aug 3, 2016

⌛ Testing commit db8c3ef with merge e2d4ff5...
@bors-servo
Copy link
Contributor

bors-servo commented Aug 3, 2016

☀️ Test successful - arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows-dev
@bors-servo bors-servo merged commit db8c3ef into master Aug 3, 2016
3 of 4 checks passed
3 of 4 checks passed
dependency-ci Failed dependency checks
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Aug 3, 2016
Closed
0 of 5 tasks complete
@cbrewster cbrewster mentioned this pull request Aug 3, 2016
Closed
@Ms2ger Ms2ger deleted the wr-wr-next branch Aug 15, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Ms2ger Ms2ger

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@Ms2ger @highfive @bors-servo @wafflespeanut @gw3583
You can’t perform that action at this time.