Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from Sep 9, 2016
Merged

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

merged 1 commit into from Sep 9, 2016

Conversation

benrimmington
Copy link
Collaborator

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

@jtbandes
Copy link
Collaborator

jtbandes commented Sep 9, 2016

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

@@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be Swift 3.0.1, not 3.1.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Member

tkremenek commented Sep 9, 2016

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
Copy link
Collaborator

lattner commented Sep 9, 2016

LGTM

@tkremenek
Copy link
Member

Agreed.

@benrimmington benrimmington deleted the swift-3.1-changelog branch September 9, 2016 20:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants