Changeset 12018 for branches/ALPS/HeuristicLab.Clients.Hive.Slave.App/3.3

Timestamp:

02/16/15 20:14:52 (10 years ago)

Author:

pfleck

Message:

#2269

• merged trunk after 3.3.11 release
• updated copyright and plugin version in ALPS plugin
• removed old ALPS samples based on an userdefined alg

Location:

branches/ALPS

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.Slave.App/3.3/HiveSlaveApplication.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave.App/3.3/MainWindow.Designer.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave.App/3.3/MainWindow.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave.App/3.3/Plugin.cs.frame (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave.App/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)

branches/ALPS/HeuristicLab.Clients.Hive.Slave.App/3.3/HiveSlaveApplication.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ALPS/HeuristicLab.Clients.Hive.Slave.App/3.3/MainWindow.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ALPS/HeuristicLab.Clients.Hive.Slave.App/3.3/MainWindow.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ALPS/HeuristicLab.Clients.Hive.Slave.App/3.3/Plugin.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -28 +28 @@
 
 namespace HeuristicLab.Clients.Hive.Slave.App {
-  [Plugin("HeuristicLab.Clients.Hive.Slave.App", "3.3.10.$WCREV$")]
+  [Plugin("HeuristicLab.Clients.Hive.Slave.App", "3.3.11.$WCREV$")]
   [PluginFile("HeuristicLab.Clients.Hive.Slave.App-3.3.dll", PluginFileType.Assembly)]      
   [PluginDependency("HeuristicLab.Clients.Hive.SlaveCore", "3.3")]  

branches/ALPS/HeuristicLab.Clients.Hive.Slave.App/3.3/Properties/AssemblyInfo.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -32 +32 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2015 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -55 +55 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.10.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.11.$WCREV$")]