[5.3] The Catalina Merge #2786
Merged
[5.3] The Catalina Merge #2786
Conversation
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
The Catalina Merge
|
@parkera This requires your approval and merge. |
|
@swift-ci please test |
parkera
approved these changes
May 8, 2020
|
I think this was somehow merged into master by mistake, the release/5.3 branch shows no new commits since it was branched weeks ago. |
3405691582
added a commit
to 3405691582/swift-corelibs-foundation
that referenced
this pull request
May 11, 2020
PR swiftlang#2786 references symbol __kCFAllocatorTypeID_CONST in CFRuntime.c but this was removed in swiftlang#1708. After interpreting the commit, it looks like this symbol was renamed to _kCFRuntimeIDCFAllocator. Therefore, make this rename again.
3405691582
added a commit
to 3405691582/swift-corelibs-foundation
that referenced
this pull request
May 11, 2020
PR swiftlang#2786 references symbol __kCFAllocatorTypeID_CONST in CFRuntime.c but this was removed in swiftlang#1708. After interpreting the commit, it looks like this symbol was renamed to _kCFRuntimeIDCFAllocator. Therefore, make this rename again.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR cherry-picks the Catalina merge from #2782 onto the 5.3 release branch.