Context Navigation

Plugin.cs.frame

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:

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.Data
- Property svn:mergeinfo changed
  /branches/2435-alglib_3_15/HeuristicLab.Data (added) merged: 17034
  /trunk/HeuristicLab.Data merged: 17037,17180,17184
branches/2521_ProblemRefactoring/HeuristicLab.Data/3.3
- Property svn:mergeinfo changed
  /branches/2435-alglib_3_15/HeuristicLab.Data/3.3 (added) merged: 17034
  /trunk/HeuristicLab.Data/3.3 merged: 17037,17180,17184

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

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

/branches/2435-alglib_3_15/HeuristicLab.Data (added)	merged: 17034
/trunk/HeuristicLab.Data	merged: 17037,17180,17184

/branches/2435-alglib_3_15/HeuristicLab.Data/3.3 (added)	merged: 17034
/trunk/HeuristicLab.Data/3.3	merged: 17037,17180,17184