Changes between Version 3 and Version 5 of Ticket #5745


Ignore:
Timestamp:
09/23/2017 01:06:39 AM (2 years ago)
Author:
dzhang
Comment:

Merged "swift" into master to get Carthage. Rebased master onto "swift" to sync the two branches.

This 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.

Legend:

Unmodified
Added
Removed
Modified
  • Ticket #5745

    • Property Status changed from new to closed
    • Property Resolution changed from to fixed
    • Property Summary changed from Synchronize ABP master to swift branch to Synchronize ABP master and swift branch
  • Ticket #5745 – Description

    v3 v5  
    88=== What to change ===  
    99 
    10 Merge [master] with [swift] branch and vice-versa to synchronize the changes in each branch.  
     10Synchronize [master] with [swift].