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

Merge cleanup #36

Merged
merged 5 commits into from
Mar 3, 2017
Merged

Merge cleanup #36

merged 5 commits into from
Mar 3, 2017

Conversation

gonsie
Copy link
Member

@gonsie gonsie commented Mar 3, 2017

Master now successfully builds! Fixes #31 and closes #29.

There are a number of real fixes needed, but these can be addressed later.

@becker33 becker33 merged commit 2cb081e into master Mar 3, 2017
@gonsie gonsie deleted the merge_cleanup branch March 3, 2017 18:50
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.

datawarp.h missing Integrate changes for Datawarp into master
2 participants