- Timestamp:
- 07/18/14 13:34:37 (10 years ago)
- Location:
- branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.App
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.App
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/sources/HeuristicLab.Clients.Hive.Slave.App merged eligible /branches/Algorithms.GradientDescent/HeuristicLab.Clients.Hive.Slave.App 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Clients.Hive.Slave.App 6917-7005 /branches/CloningRefactoring/HeuristicLab.Clients.Hive.Slave.App 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Clients.Hive.Slave.App 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Clients.Hive.Slave.App 5815-6180 /branches/DataAnalysis/HeuristicLab.Clients.Hive.Slave.App 4458-4459,4462,4464 /branches/GP.Grammar.Editor/HeuristicLab.Clients.Hive.Slave.App 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Clients.Hive.Slave.App 5060 /branches/NET40/sources/HeuristicLab.Clients.Hive.Slave.App 5138-5162 /branches/ParallelEngine/HeuristicLab.Clients.Hive.Slave.App 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Clients.Hive.Slave.App 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Clients.Hive.Slave.App 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Clients.Hive.Slave.App 6828 /branches/RuntimeOptimizer/HeuristicLab.Clients.Hive.Slave.App 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Clients.Hive.Slave.App 7787-8333 /branches/SlaveShutdown/HeuristicLab.Clients.Hive.Slave.App 8944-8956 /branches/SuccessProgressAnalysis/HeuristicLab.Clients.Hive.Slave.App 5370-5682 /branches/Trunk/HeuristicLab.Clients.Hive.Slave.App 6829-6865 /branches/UnloadJobs/HeuristicLab.Clients.Hive.Slave.App 9168-9215 /branches/VNS/HeuristicLab.Clients.Hive.Slave.App 5594-5752 /branches/histogram/HeuristicLab.Clients.Hive.Slave.App 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/HiveSlaveApplication.cs
r11203 r11204 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/MainWindow.Designer.cs
r11203 r11204 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/MainWindow.cs
r11203 r11204 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/Plugin.cs.frame
r11203 r11204 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 28 28 29 29 namespace HeuristicLab.Clients.Hive.Slave.App { 30 [Plugin("HeuristicLab.Clients.Hive.Slave.App", "3.3. 7.$WCREV$")]30 [Plugin("HeuristicLab.Clients.Hive.Slave.App", "3.3.10.$WCREV$")] 31 31 [PluginFile("HeuristicLab.Clients.Hive.Slave.App-3.3.dll", PluginFileType.Assembly)] 32 32 [PluginDependency("HeuristicLab.Clients.Hive.SlaveCore", "3.3")] -
branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/Properties/AssemblyInfo.cs.frame
r11203 r11204 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 32 32 [assembly: AssemblyCompany("")] 33 33 [assembly: AssemblyProduct("HeuristicLab")] 34 [assembly: AssemblyCopyright("(c) 2002-201 2HEAL")]34 [assembly: AssemblyCopyright("(c) 2002-2014 HEAL")] 35 35 [assembly: AssemblyTrademark("")] 36 36 [assembly: AssemblyCulture("")] … … 55 55 // [assembly: AssemblyVersion("1.0.*")] 56 56 [assembly: AssemblyVersion("3.3.0.0")] 57 [assembly: AssemblyFileVersion("3.3. 7.$WCREV$")]57 [assembly: AssemblyFileVersion("3.3.10.$WCREV$")]
Note: See TracChangeset
for help on using the changeset viewer.