Context Navigation

← Previous Change
Next Change →

Changeset 17226 for branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3

Timestamp:

08/29/19 15:57:35 (5 years ago)

Author:

mkommend

Message:

#2521: Merged trunk changes into problem refactoring branch.

Location:

branches/2521_ProblemRefactoring

Files:

: 26 edited

. (modified) (1 prop)
HeuristicLab.Clients.Hive.Slave.Views/3.3/AboutDialog.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Slave.Views/3.3/AboutDialog.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Slave.Views/3.3/AboutView.Designer.cs (modified) (2 diffs)
HeuristicLab.Clients.Hive.Slave.Views/3.3/AboutView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Slave.Views/3.3/LogView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Slave.Views/3.3/LogView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Slave.Views/3.3/Plugin.cs.frame (modified) (2 diffs)
HeuristicLab.Clients.Hive.Slave.Views/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsBase.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsBase.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsWithKill.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsWithKill.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveItem.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainViewBase.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainViewBase.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainViewTray.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainViewTray.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveStats.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveStats.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Slave.Views/3.3/TaskView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Slave.Views/3.3/TaskView.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/2521_ProblemRefactoring

Property svn:mergeinfo changed

/branches/2435-alglib_3_15 (added)	merged: 16683-16684,17034,17036
/trunk	merged: 16978-16983,16992,16997,17007-17009,17014-17016,17019-17024,17028,17030,17032-17033,17037,17043-17044,17048,17052,17076-17089,17092-17095,17110,17118,17121,17125-17128,17132,17137,17139,17150,17154,17179-17180,17182-17185,17191,17198,17220-17223

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3/AboutDialog.Designer.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3/AboutDialog.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3/AboutView.Designer.cs

-                      r16723
+                      r17226
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
       this.txtCopyright.Size = new System.Drawing.Size(308, 13);
       this.txtCopyright.TabIndex = 30;
       this.txtCopyright.Text = "(c) 2002-2015 HEAL";
+      this.txtCopyright.Text = "(c) HEAL";
       //
       // versionTextBox

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3/AboutView.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3/LogView.Designer.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3/LogView.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3/Plugin.cs.frame

-                      r16723
+                      r17226
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 namespace HeuristicLab.Clients.Hive.Slave.Views {
   [Plugin("HeuristicLab.Clients.Hive.Slave.Views", "3.3.15.$WCREV$")]
+  [Plugin("HeuristicLab.Clients.Hive.Slave.Views", "3.3.16.$WCREV$")]
   [PluginFile("HeuristicLab.Clients.Hive.Slave.Views-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Clients.Hive.SlaveCore", "3.3")]

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3/Properties/AssemblyInfo.cs.frame

-                      r16723
+                      r17226
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
 [assembly: AssemblyCopyright("(c) 2002-2018 HEAL")]
+[assembly: AssemblyCopyright("(c) HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 …
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
 [assembly: AssemblyFileVersion("3.3.15.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.16.$WCREV$")]

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsBase.Designer.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsBase.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsWithKill.Designer.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsWithKill.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveItem.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainView.Designer.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainView.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainViewBase.Designer.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainViewBase.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainViewTray.Designer.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainViewTray.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveStats.Designer.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveStats.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveView.Designer.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveView.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3/TaskView.Designer.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3/TaskView.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 17226 for branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.Slave.Views/3.3

Legend:

Download in other formats: