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

Rename BuildTests to JSON_BuildTests #652

Merged
merged 1 commit into from
Jul 15, 2017
Merged

Conversation

olegendo
Copy link

This avoids potential conflicts with other libraries when the library is
built from source and included in a bigger cmake build.

This avoids potential conflicts with other libraries when the library is
built from source and included in a bigger cmake build.
@coveralls
Copy link

Coverage Status

Coverage remained the same at 100.0% when pulling cd80052 on olegendo:develop into 7dee868 on nlohmann:develop.

Copy link
Owner

@nlohmann nlohmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@nlohmann nlohmann self-assigned this Jul 11, 2017
@nlohmann nlohmann added this to the Release 3.0.0 milestone Jul 11, 2017
@nlohmann
Copy link
Owner

Thanks a lot!

@nlohmann nlohmann closed this Jul 11, 2017
@olegendo
Copy link
Author

Sure, no problem. Are you going to merge it into the develop branch?

@nlohmann nlohmann reopened this Jul 14, 2017
@nlohmann
Copy link
Owner

Sorry, i pressed the wrong button. I shall merge it tomorrow.

@coveralls
Copy link

Coverage Status

Coverage remained the same at 100.0% when pulling cd80052 on olegendo:develop into 7dee868 on nlohmann:develop.

@nlohmann nlohmann merged commit 8a9133c into nlohmann:develop Jul 15, 2017
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.

4 participants