Context Navigation

← Previous Change
Next Change →

HeuristicLab.Parameters.Views

Timestamp:

09/11/19 14:06:25 (5 years ago)

Author:

gkronber

Message:

#2925: merged r17037:17242 from trunk to branch

Location:

branches/2925_AutoDiffForDynamicalModels

Files:

: 17 edited

. (modified) (1 prop)
HeuristicLab.Parameters.Views/3.3/ConstrainedValueParameterConfigurationView.Designer.cs (modified) (1 diff)
HeuristicLab.Parameters.Views/3.3/ConstrainedValueParameterConfigurationView.cs (modified) (1 diff)
HeuristicLab.Parameters.Views/3.3/ConstrainedValueParameterView.Designer.cs (modified) (1 diff)
HeuristicLab.Parameters.Views/3.3/ConstrainedValueParameterView.cs (modified) (1 diff)
HeuristicLab.Parameters.Views/3.3/LookupParameterView.Designer.cs (modified) (1 diff)
HeuristicLab.Parameters.Views/3.3/LookupParameterView.cs (modified) (1 diff)
HeuristicLab.Parameters.Views/3.3/ParameterView.Designer.cs (modified) (1 diff)
HeuristicLab.Parameters.Views/3.3/ParameterView.cs (modified) (1 diff)
HeuristicLab.Parameters.Views/3.3/Plugin.cs.frame (modified) (2 diffs)
HeuristicLab.Parameters.Views/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
HeuristicLab.Parameters.Views/3.3/ScopeTreeLookupParameterView.Designer.cs (modified) (1 diff)
HeuristicLab.Parameters.Views/3.3/ScopeTreeLookupParameterView.cs (modified) (1 diff)
HeuristicLab.Parameters.Views/3.3/ValueLookupParameterView.Designer.cs (modified) (1 diff)
HeuristicLab.Parameters.Views/3.3/ValueLookupParameterView.cs (modified) (1 diff)
HeuristicLab.Parameters.Views/3.3/ValueParameterView.Designer.cs (modified) (1 diff)
HeuristicLab.Parameters.Views/3.3/ValueParameterView.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/2925_AutoDiffForDynamicalModels

Property svn:mergeinfo changed

/branches/2435-alglib_3_15 (added)	merged: 16683-16684,17034,17036
/trunk	merged: 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,17242

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Parameters.Views/3.3/ConstrainedValueParameterConfigurationView.Designer.cs

r16662	r17246
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/2925_AutoDiffForDynamicalModels/HeuristicLab.Parameters.Views/3.3/ConstrainedValueParameterConfigurationView.cs

r16662	r17246
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/2925_AutoDiffForDynamicalModels/HeuristicLab.Parameters.Views/3.3/ConstrainedValueParameterView.Designer.cs

r16662	r17246
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/2925_AutoDiffForDynamicalModels/HeuristicLab.Parameters.Views/3.3/ConstrainedValueParameterView.cs

r16892	r17246
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/2925_AutoDiffForDynamicalModels/HeuristicLab.Parameters.Views/3.3/LookupParameterView.Designer.cs

r16662	r17246
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/2925_AutoDiffForDynamicalModels/HeuristicLab.Parameters.Views/3.3/LookupParameterView.cs

r16662	r17246
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/2925_AutoDiffForDynamicalModels/HeuristicLab.Parameters.Views/3.3/ParameterView.Designer.cs

r16662	r17246
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/2925_AutoDiffForDynamicalModels/HeuristicLab.Parameters.Views/3.3/ParameterView.cs

r16662	r17246
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/2925_AutoDiffForDynamicalModels/HeuristicLab.Parameters.Views/3.3/Plugin.cs.frame

-                      r16662
+                      r17246
 #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.
 …
   /// Plugin class for HeuristicLab.Parameters.Views plugin.
   /// </summary>
   [Plugin("HeuristicLab.Parameters.Views", "3.3.15.$WCREV$")]
+  [Plugin("HeuristicLab.Parameters.Views", "3.3.16.$WCREV$")]
   [PluginFile("HeuristicLab.Parameters.Views-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Parameters.Views/3.3/Properties/AssemblyInfo.cs.frame

-                      r16662
+                      r17246
 #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("")]
 …
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
 [assembly: AssemblyFileVersion("3.3.15.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.16.$WCREV$")]

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Parameters.Views/3.3/ScopeTreeLookupParameterView.Designer.cs

r16662	r17246
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/2925_AutoDiffForDynamicalModels/HeuristicLab.Parameters.Views/3.3/ScopeTreeLookupParameterView.cs

r16662	r17246
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/2925_AutoDiffForDynamicalModels/HeuristicLab.Parameters.Views/3.3/ValueLookupParameterView.Designer.cs

r16662	r17246
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/2925_AutoDiffForDynamicalModels/HeuristicLab.Parameters.Views/3.3/ValueLookupParameterView.cs

r16892	r17246
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/2925_AutoDiffForDynamicalModels/HeuristicLab.Parameters.Views/3.3/ValueParameterView.Designer.cs

r16662	r17246
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/2925_AutoDiffForDynamicalModels/HeuristicLab.Parameters.Views/3.3/ValueParameterView.cs

r16892	r17246
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 17246 for branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Parameters.Views

Legend:

Download in other formats: