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

More WSA wrapping #1034

Merged
merged 4 commits into from
Sep 28, 2017
Merged

More WSA wrapping #1034

merged 4 commits into from
Sep 28, 2017

Conversation

StephenHodgson
Copy link
Contributor

@StephenHodgson StephenHodgson commented Sep 27, 2017

Now builds for win standalone. (after Input Update gets merged)

@StephenHodgson StephenHodgson changed the title Updates the Dev branch so it can build to win standalone More WSA wrapping Sep 27, 2017
@SimonDarksideJ
Copy link
Contributor

Looks good, however, you have edited "StartSessionButton.cs" in both this PR and #1028
You should exclude changing this file in this PR and leave it in the InputUpdate PR

@StephenHodgson
Copy link
Contributor Author

I based this PR off the other, so those changes will disappear once it's merged.

@SimonDarksideJ
Copy link
Contributor

Best be sure to merge them in order then :D @StephenHodgson
I merged them backwards, but PR's should only ever run from the base branch, not from another PR

@StephenHodgson
Copy link
Contributor Author

Agreed, I usually do a rebase each time.

@SimonDarksideJ
Copy link
Contributor

In which case, this is tested fine (and yes, Builds to standalone with both PR's) and can be merged.
P.S. Dropped you a note on Slack

@StephenHodgson StephenHodgson merged commit c3cf9c2 into microsoft:Dev_Unity_2017.2.0 Sep 28, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants