Skip to content

Merge remote-tracking branch 'upstream/stable' into merge_stable#5298

Merged
MartinNowak merged 10 commits intodlang:masterfrom
MartinNowak:merge_stable
Mar 22, 2017
Merged

Merge remote-tracking branch 'upstream/stable' into merge_stable#5298
MartinNowak merged 10 commits intodlang:masterfrom
MartinNowak:merge_stable

Conversation

@MartinNowak
Copy link
Member

Conflicts:
std/regex/internal/backtracking.d
std/regex/internal/shiftor.d
std/regex/package.d

kinke and others added 9 commits March 6, 2017 20:19
Apparently a leftover from dlang/phobos@5a2491a. Not included in the
makefile and not compilable either.
Fix issue 17157 ctRegex.matchAll doesn't set last item in Captures
fix issue 17243 - std.math.{FloatingPointControl,ieeeFlags} don't work on x86_64
Remove orphaned std.regex.internal.shiftor
Fix issue 17075 ctRegex BacktrackingMatcher.prevStack: free(): invali…
merged-on-behalf-of: H. S. Teoh <quickfur@users.noreply.github.com>
@dlang-bot
Copy link
Contributor

Fix Bugzilla Description
17075 ctRegex BacktrackingMatcher.prevStack: free(): invalid pointer
17157 ctRegex.matchAll doesn't set last item in Captures
17243 std.math.{FloatingPointControl,ieeeFlags} don't work on x86_64

# Conflicts:
#	std/regex/internal/backtracking.d
#	std/regex/internal/shiftor.d
#	std/regex/package.d
@MartinNowak
Copy link
Member Author

Auto-merge toggled on

@MartinNowak MartinNowak merged commit f227d72 into dlang:master Mar 22, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants