Changeset 12627
- Timestamp:
- 07/07/15 09:42:13 (9 years ago)
- Location:
- trunk/sources
- Files:
-
- 5 edited
- 3 copied
-
HeuristicLab.Optimization (modified) (1 prop)
-
HeuristicLab.Optimization.Views (modified) (1 prop)
-
HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj (modified) (1 diff)
-
HeuristicLab.Optimization.Views/3.3/TimeLimitRunView.Designer.cs (copied) (copied from branches/TimeLimitRunOptimizer/HeuristicLab.Optimization.Views/3.3/TimeLimitRunView.Designer.cs)
-
HeuristicLab.Optimization.Views/3.3/TimeLimitRunView.cs (copied) (copied from branches/TimeLimitRunOptimizer/HeuristicLab.Optimization.Views/3.3/TimeLimitRunView.cs)
-
HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (modified) (1 diff)
-
HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs (copied) (copied from branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs)
-
HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (modified) (1 prop)
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Optimization
- Property svn:mergeinfo changed
/branches/TimeLimitRunOptimizer/HeuristicLab.Optimization (added) merged: 9438,12118,12128,12625
- Property svn:mergeinfo changed
-
trunk/sources/HeuristicLab.Optimization.Views
-
Property
svn:mergeinfo
set to
/branches/TimeLimitRunOptimizer/HeuristicLab.Optimization.Views merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/sources/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj
r12102 r12627 281 281 <DependentUpon>RunCollectionChartAggregationView.cs</DependentUpon> 282 282 </Compile> 283 <Compile Include="TimeLimitRunView.cs"> 284 <SubType>UserControl</SubType> 285 </Compile> 286 <Compile Include="TimeLimitRunView.Designer.cs"> 287 <DependentUpon>TimeLimitRunView.cs</DependentUpon> 288 </Compile> 283 289 <Compile Include="UserDefinedAlgorithmView.cs"> 284 290 <SubType>UserControl</SubType> -
trunk/sources/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj
r11970 r12627 165 165 <Compile Include="MetaOptimizers\BatchRun.cs" /> 166 166 <Compile Include="MetaOptimizers\Experiment.cs" /> 167 <Compile Include="MetaOptimizers\TimeLimitRun.cs" /> 167 168 <Compile Include="RunCollectionModification\RunCollectionRunRemover.cs" /> 168 169 <Compile Include="Plugin.cs" /> -
trunk/sources/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs
- Property svn:mergeinfo changed
/branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (added) merged: 12118,12625
- Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.
