Changes between Version 1 and Version 2 of Ticket #5745, comment 5


Ignore:
Timestamp:
09/23/2017 01:19:34 AM (22 months ago)
Author:
dzhang
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • Ticket #5745, comment 5

    v1 v2  
    11Merged "swift" into master to get Carthage. Rebased master onto "swift" to sync the two branches. 
    22 
    3 This is a slightly different procedure from what was originally discussed due to the previous push of the Xcode project apparently clearing up conflicts with that file. The end result of syncing the branches was achieved. 
     3This was a slightly different procedure from what was originally discussed due to the previous push of the Xcode project apparently clearing up conflicts with that file. The end result of syncing the branches was achieved.