Merge in 4.0 changes into 4.1 trunk #3
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…search and Library directories can be searched recursively
…he short-circut warning explanation in the manual
…d test to find no_value warning, and corrected message texts to reflect what no_value really means. Ticket 973
… 942, ticket 943, ticket 945, and ticket 947
…et 853, ticket 928, ticket 938, ticket 752, ticket 915, ticket 948, ticket 921
… to sanitize parameters before calling some floating point routines from the C library.
Merge remote-tracking branch 'origin/master' into HEAD Conflicts: source/Makefile.gnu source/configure
|
I think we should do a 'squash merge' |
|
That sounds reasonable. You should be able to just pick Squash and merge from the drop-down list.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Many outstanding changes made to the 4.0 branch to be merged into the trunk.