Context Navigation

← Previous Change
Next Change →

Problems

Timestamp:

07/06/17 10:19:37 (7 years ago)

Author:

gkronber

Message:

#2650: merged r14826 from trunk to stable. The only remaining conflict is DataTableControl and ScatterPlotControl which have been renamed within r14982 (-> tree conflict).

Location:

stable

Files:

: 3 edited

. (modified) (1 prop)
HeuristicLab.Optimization (modified) (1 prop)
HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (modified) (1 prop)

stable

Property svn:mergeinfo changed

/branches/symbreg-factors-2650 (added)

merged: 14232-14233,14237-14243,14248-14249,14251,14259,14266,14276-14277,14330-14331,14339,14351,14399,14401-14403,14421,14449,14497-14499,14501-14502,14534-14535,14539-14542,14554,14560,14589,14591-14592,14615,14693,14701,14715-14717,14719-14720,14751-14756,14758-14766,14812-14815,14823-14825

stable/HeuristicLab.Optimization
- Property svn:mergeinfo changed
  /branches/symbreg-factors-2650/HeuristicLab.Optimization (added) merged: 14449,14497-14499,14542,14591-14592
stable/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs
- Property svn:mergeinfo changed
  /branches/symbreg-factors-2650/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (added) merged: 14497,14499,14591-14592

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 15131 for stable/HeuristicLab.Optimization/3.3/Problems

stable

stable/HeuristicLab.Optimization

stable/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs

Download in other formats: