Merge remote-tracking branch 'upstream/stable' into merge_stable#5944
Merged
dlang-bot merged 3 commits intodlang:masterfrom Dec 18, 2017
Merged
Merge remote-tracking branch 'upstream/stable' into merge_stable#5944dlang-bot merged 3 commits intodlang:masterfrom
dlang-bot merged 3 commits intodlang:masterfrom
Conversation
Contributor
|
Thanks for your pull request, @MartinNowak! Bugzilla referencesYour PR doesn't reference any Bugzilla issue. If your PR contains non-trivial changes, please reference a Bugzilla issue or create a manual changelog. |
MartinNowak
requested review from
JackStouffer,
PetarKirov,
andralex and
wilzbach
as code owners
wilzbach
approved these changes
Dec 18, 2017
Contributor
|
CircleCi failure is due to #5930 -> will rebase this PR. |
$(TR $(TD $(LREF OutputRangeObject))
$(TD Class that implements the $(D OutputRange) interface and wraps the
$(D put) methods in virtual functions.
*************************************************************
)) <- add the missing ending double parentheses
***************************************************************
wilzbach
force-pushed
the
merge_stable
branch
from
8b54be1 to
66d3950
Compare
Member
Author
|
Please don't rebase merge commits. Loosing the parent information does easily cause merge conflicts. |
Contributor
Sorry.
No, we merge ourselves and with 2.0 the location of the config file changed. |
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
5 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.