Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/18/14 13:34:37 (10 years ago)
Author:
ascheibe
Message:

merged only Hive changes from trunk into branch

Location:
branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon

    • Property svn:mergeinfo set to (toggle deleted branches)
      /trunk/sources/HeuristicLab.Clients.Hive.Slave.TrayIconmergedeligible
      /branches/Algorithms.GradientDescent/HeuristicLab.Clients.Hive.Slave.TrayIcon5516-5520
      /branches/Benchmarking/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon6917-7005
      /branches/CloningRefactoring/HeuristicLab.Clients.Hive.Slave.TrayIcon4656-4721
      /branches/DataAnalysis Refactoring/HeuristicLab.Clients.Hive.Slave.TrayIcon5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Clients.Hive.Slave.TrayIcon5815-6180
      /branches/DataAnalysis/HeuristicLab.Clients.Hive.Slave.TrayIcon4458-4459,​4462,​4464
      /branches/GP.Grammar.Editor/HeuristicLab.Clients.Hive.Slave.TrayIcon6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Clients.Hive.Slave.TrayIcon5060
      /branches/NET40/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon5138-5162
      /branches/ParallelEngine/HeuristicLab.Clients.Hive.Slave.TrayIcon5175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Clients.Hive.Slave.TrayIcon7568-7810
      /branches/QAPAlgorithms/HeuristicLab.Clients.Hive.Slave.TrayIcon6350-6627
      /branches/Restructure trunk solution/HeuristicLab.Clients.Hive.Slave.TrayIcon6828
      /branches/RuntimeOptimizer/HeuristicLab.Clients.Hive.Slave.TrayIcon8943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.Clients.Hive.Slave.TrayIcon7787-8333
      /branches/SlaveShutdown/HeuristicLab.Clients.Hive.Slave.TrayIcon8944-8956
      /branches/SuccessProgressAnalysis/HeuristicLab.Clients.Hive.Slave.TrayIcon5370-5682
      /branches/Trunk/HeuristicLab.Clients.Hive.Slave.TrayIcon6829-6865
      /branches/UnloadJobs/HeuristicLab.Clients.Hive.Slave.TrayIcon9168-9215
      /branches/VNS/HeuristicLab.Clients.Hive.Slave.TrayIcon5594-5752
      /branches/histogram/HeuristicLab.Clients.Hive.Slave.TrayIcon5959-6341

  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon/3.3/MainWindow.Designer.cs

    r11203 r11204  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon/3.3/MainWindow.cs

    r11203 r11204  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon/3.3/Program.cs

    r11203 r11204  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon/3.3/Properties/AssemblyInfo.cs.frame

    r11203 r11204  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3232[assembly: AssemblyCompany("HEAL")]
    3333[assembly: AssemblyProduct("HeuristicLab")]
    34 [assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
     34[assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
    3535[assembly: AssemblyTrademark("")]
    3636[assembly: AssemblyCulture("")]
    … …  
    5555// [assembly: AssemblyVersion("1.0.*")]
    5656[assembly: AssemblyVersion("3.3.0.0")]
    57 [assembly: AssemblyFileVersion("3.3.7.$WCREV$")]
     57[assembly: AssemblyFileVersion("3.3.10.$WCREV$")]

  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon/3.3/TrayIconInstaller.Designer.cs

    r11203 r11204  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon/3.3/TrayIconInstaller.cs

    r11203 r11204  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
Note: See TracChangeset for help on using the changeset viewer.