Changeset 7905

Timestamp:

05/24/12 16:06:40 (13 years ago)

Author:

svonolfe

Message:

Merged changes of trunk integration into branch (#1177)

Location:

branches/VRP

Files:

• HeuristicLab.Problems.Instances.VehicleRouting.Views (modified) (1 prop)
• HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting.Views/3.4 (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/Plugin.cs.frame (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/Plugin.cs.frame

@@ -26 +26 @@
   [PluginFile("HeuristicLab.Problems.Instances.VehicleRouting.Views-3.4.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
-  [PluginDependency("HeuristicLab.Data", "3.3")]
   [PluginDependency("HeuristicLab.MainForm", "3.3")]
   [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]

branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/Plugin.cs.frame

@@ -28 +28 @@
   [Plugin("HeuristicLab.Problems.VehicleRouting.Views", "3.4.0.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.VehicleRouting.Views-3.4.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]
   [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
   [PluginDependency("HeuristicLab.Core.Views", "3.3")]
-  [PluginDependency("HeuristicLab.Data", "3.3")]
-  [PluginDependency("HeuristicLab.Encodings.PermutationEncoding", "3.3")]
   [PluginDependency("HeuristicLab.MainForm", "3.3")]
   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
-  [PluginDependency("HeuristicLab.Optimization", "3.3")]
   [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
-  [PluginDependency("HeuristicLab.Parameters", "3.3")]
   [PluginDependency("HeuristicLab.Problems.VehicleRouting", "3.4")]
-  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
   public class HeuristicLabProblemsVehicleRoutingViewsPlugin : PluginBase {
   }