Merge remote-tracking branch 'upstream/stable' into merge_stable#6940
Merged
WalterBright merged 7 commits intodlang:masterfrom Jun 26, 2017
Merged
Merge remote-tracking branch 'upstream/stable' into merge_stable#6940WalterBright merged 7 commits intodlang:masterfrom
WalterBright merged 7 commits intodlang:masterfrom
Conversation
fix Issue 17468 - Internal Assertion fails during CTFE merged-on-behalf-of: Andrei Alexandrescu <andralex@users.noreply.github.com>
Merge remote-tracking branch 'upstream/master' into merge_master
- VERSION will get bumped with a release, not directly after a release, e.g. v2.075.0-8aeca3c (somewhat before v2.075.0) => v2.074.1-456-g8aeca3c (456 commits after v2.074.1) - VERSION file will get updated in stable and gets merged back into master - ensures v2.074.1-ddd-hhhhh contains all changes from v2.074.1
use git describe for development versions
Contributor
|
Thanks for your pull request, @MartinNowak! Bugzilla references
|
This was referenced Jun 26, 2017
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
No description provided.