Changeset 7268 for branches/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive.Slave.App/3.3

Timestamp:

01/03/12 11:22:21 (13 years ago)

Author:

gkronber

Message:

#1081: merged r7214:7266 from trunk into time series branch.

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.Slave.App/3.3/HiveSlaveApplication.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/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive.Slave.App/3.3/HiveSlaveApplication.cs

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

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

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

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 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.5.$WCREV$")]
+  [Plugin("HeuristicLab.Clients.Hive.Slave.App", "3.3.6.$WCREV$")]
   [PluginFile("HeuristicLab.Clients.Hive.Slave.App-3.3.dll", PluginFileType.Assembly)]      
   [PluginDependency("HeuristicLab.Clients.Hive.SlaveCore", "3.3")]  

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -32 +32 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2011 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -54 +54 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.3.5.0")]
-[assembly: AssemblyFileVersion("3.3.5.$WCREV$")]
+[assembly: AssemblyVersion("3.3.0.0")]
+[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]