Skip to content

Merge CMakefile and upstream updates #1

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

Merged
merged 11 commits into from
Nov 11, 2019
Merged

Merge CMakefile and upstream updates #1

merged 11 commits into from
Nov 11, 2019

Conversation

yosagi
Copy link
Owner

@yosagi yosagi commented Nov 11, 2019

merge upstream 123d9f0 and my PR to the upstream (godotengine#344)

@yosagi yosagi changed the title Cmakefile and upstream update merge CMakefile and upstream updates Nov 11, 2019
@yosagi yosagi changed the title merge CMakefile and upstream updates Merge CMakefile and upstream updates Nov 11, 2019
@yosagi yosagi merged commit 0a1b130 into master Nov 11, 2019
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.

6 participants