Free cookie consent management tool by TermsFeed Policy Generator

Changes between Initial Version and Version 1 of Ticket #2650, comment 100


Ignore:
Timestamp:
07/06/17 10:20:01 (7 years ago)
Author:
gkronber
Comment:

Legend:

Unmodified
Added
Removed
Modified

  • Ticket #2650, comment 100

    initial v1  
    11Merging r14826 from trunk to stable leads to the following tree conflicts:
    22 * DataTableControl and ScatterPlotControl: These files have been renamed in r14982 (#2713). The change has already been merged to stable (out of order).
    3  * HeuristicLab.ExtLibs/HeuristicLab.Igraph. This folder has been created with r14234 (#2651). Which has not yet been merged to stable.
    4  * HeuristicLab.Tests/HeuristicLab.IGraph. This folder has been created with r14244 (#2651). Which has not yet been merged to stable.
     3 * ~~HeuristicLab.ExtLibs/HeuristicLab.Igraph. This folder has been created with r14234 (#2651). Which has not yet been merged to stable.~~
     4 * ~~HeuristicLab.Tests/HeuristicLab.IGraph. This folder has been created with r14244 (#2651). Which has not yet been merged to stable.~~