Update CHANGELOG.md for SE-0045 (Swift 3.1) #4690

Merged
merged 1 commit into from Sep 9, 2016

Projects

None yet

4 participants

@benrimmington
Contributor

SE-0045 was not merged into the swift-3.0-branch (see #3600).

@benrimmington benrimmington referenced this pull request in apple/swift-evolution Sep 9, 2016
Merged

Add new section for Swift 3.1 proposals #522

@jtbandes
Collaborator
jtbandes commented Sep 9, 2016

I'm going to leave these to someone with more insider knowledge. @DougGregor or @tkremenek, please review.

@tkremenek tkremenek commented on the diff Sep 9, 2016
CHANGELOG.md
@@ -1,6 +1,6 @@
Note: This is in reverse chronological order, so newer entries are added to the top.
-Swift 3.0
+Swift 3.1
@tkremenek
tkremenek Sep 9, 2016 Member

This should be Swift 3.0.1, not 3.1.

@benrimmington
benrimmington Sep 9, 2016 Contributor

I thought Swift 3.0.1 will use the same swift-3.0-branch? The changes for SE-0045 are only in the master branch.

@tkremenek
Member
tkremenek commented Sep 9, 2016 edited

Sorry, you are right. Swift 3.0.1 is from swift-3.0-branch and Swift 3.1 will re-branch from master.

@lattner lattner merged commit 4a10a12 into apple:master Sep 9, 2016
@lattner
Contributor
lattner commented Sep 9, 2016

LGTM

@tkremenek
Member

Agreed.

@benrimmington benrimmington deleted the unknown repository branch Sep 9, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment