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

Fix Windows build errors #1704

Merged
merged 2 commits into from
Apr 29, 2019
Merged

Fix Windows build errors #1704

merged 2 commits into from
Apr 29, 2019

Conversation

jmjatlanta
Copy link
Contributor

Fixes #1593

With these changes (and the ones already merged to bitshares-fc:master), bitshares-core now builds on Windows 10.

@pmconrad
Copy link
Contributor

pmconrad commented Apr 6, 2019

Was fc already bumped to include these changes in develop branch? If not please do so.

@pmconrad
Copy link
Contributor

pmconrad commented Apr 8, 2019

The fc version doesn't exist, please double-check and force-push

@jmjatlanta jmjatlanta force-pushed the jmj_1593 branch 2 times, most recently from aa9dc1c to 283515d Compare April 8, 2019 17:53
@abitmore abitmore added this to the 3.1.0 - Feature Release milestone Apr 8, 2019
@pmconrad
Copy link
Contributor

Sorry, but you have to rebase on latest develop to avoid the conflict.

@jmjatlanta
Copy link
Contributor Author

Sorry, but you have to rebase on latest develop to avoid the conflict.

Rebased, conflict resolved. Thanks.

@pmconrad
Copy link
Contributor

Looks good, but can't test windows build. Travis + docker are ok, so who cares? ;-)

@jmjatlanta jmjatlanta merged commit e710483 into develop Apr 29, 2019
@abitmore abitmore deleted the jmj_1593 branch June 16, 2019 12:01
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