Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/11/15 19:42:26 (9 years ago)
Author:
abeham
Message:

#1985: merged 12626,12627 to stable

Location:
stable
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Optimization.Views

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/HLScript/HeuristicLab.Optimization.Viewsmergedeligible
      /trunk/sources/HeuristicLab.Optimization.Viewsmergedeligible
      /branches/1721-RandomForestPersistence/HeuristicLab.Optimization.Views10321-10322
      /branches/Algorithms.GradientDescent/HeuristicLab.Optimization.Views5516-5520
      /branches/Benchmarking/sources/HeuristicLab.Optimization.Views6917-7005
      /branches/CloningRefactoring/HeuristicLab.Optimization.Views4656-4721
      /branches/CodeEditor/HeuristicLab.Optimization.Views11700-11806
      /branches/DataAnalysis Refactoring/HeuristicLab.Optimization.Views5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Optimization.Views5815-6180
      /branches/DataAnalysis/HeuristicLab.Optimization.Views4458-4459,​4462,​4464
      /branches/DataPreprocessing/HeuristicLab.Optimization.Views10085-11101
      /branches/GP.Grammar.Editor/HeuristicLab.Optimization.Views6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Optimization.Views5060
      /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Optimization.Views11570-12508
      /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Optimization.Views6123-9799
      /branches/LogResidualEvaluator/HeuristicLab.Optimization.Views10202-10483
      /branches/NET40/sources/HeuristicLab.Optimization.Views5138-5162
      /branches/NSGA-II Changes/HeuristicLab.Optimization.Views12033-12122
      /branches/ParallelEngine/HeuristicLab.Optimization.Views5175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization.Views7568-7810
      /branches/QAPAlgorithms/HeuristicLab.Optimization.Views6350-6627
      /branches/Restructure trunk solution/HeuristicLab.Optimization.Views6828
      /branches/RuntimeOptimizer/HeuristicLab.Optimization.Views8943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views7787-8333
      /branches/SlaveShutdown/HeuristicLab.Optimization.Views8944-8956
      /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Optimization.Views10204-10479
      /branches/SuccessProgressAnalysis/HeuristicLab.Optimization.Views5370-5682
      /branches/TimeLimitRunOptimizer/HeuristicLab.Optimization.Views9438-12626
      /branches/Trunk/HeuristicLab.Optimization.Views6829-6865
      /branches/UnloadJobs/HeuristicLab.Optimization.Views9168-9215
      /branches/VNS/HeuristicLab.Optimization.Views5594-5752
      /branches/histogram/HeuristicLab.Optimization.Views5959-6341

  • stable/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

    r12280 r12739  
    281281      <DependentUpon>RunCollectionChartAggregationView.cs</DependentUpon>
    282282    </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>
    283289    <Compile Include="UserDefinedAlgorithmView.cs">
    284290      <SubType>UserControl</SubType>
Note: See TracChangeset for help on using the changeset viewer.