Context Navigation

Changeset 17209 for branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.QuadraticAssignment.Views/3.3

Timestamp:

08/13/19 09:40:12 (5 years ago)

Author:

gkronber

Message:

#2994: merged r17132:17198 from trunk to branch

Location:

branches/2994-AutoDiffForIntervals

Files:

branches/2994-AutoDiffForIntervals
- Property svn:mergeinfo changed
  /trunk merged: 17132,17137,17139,17150,17154,17179-17180,17182-17185,17191,17198
branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.QuadraticAssignment.Views
- Property svn:mergeinfo changed
  /trunk/HeuristicLab.Problems.QuadraticAssignment.Views (added) merged: 17180,17184

-                      r16565
+                      r17209
 #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.Problems.QuadraticAssignment.Views {
   [Plugin("HeuristicLab.Problems.QuadraticAssignment.Views", "3.3.15.$WCREV$")]
+  [Plugin("HeuristicLab.Problems.QuadraticAssignment.Views", "3.3.16.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.QuadraticAssignment.Views-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Analysis", "3.3")]

-                      r16565
+                      r17209
 #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("HEAL")]
 [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$")]

r16565	r17209
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.

r16565	r17209
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.

r16565	r17209
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.

r16565	r17209
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.

r16565	r17209
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.

r16565	r17209
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.