Changeset 12018 for branches/ALPS/HeuristicLab 3.3.sln

Timestamp:

02/16/15 20:14:52 (10 years ago)

Author:

pfleck

Message:

#2269

• merged trunk after 3.3.11 release
• updated copyright and plugin version in ALPS plugin
• removed old ALPS samples based on an userdefined alg

Location:

branches/ALPS

Files:

• . (modified) (1 prop)
• HeuristicLab 3.3.sln (modified) (2 diffs)

branches/ALPS/HeuristicLab 3.3.sln

@@ -421 +421 @@
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3", "HeuristicLab.Algorithms.ParameterlessPopulationPyramid\3.3\HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3.csproj", "{9319C447-8183-4DBC-8145-0E3CF98084CC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.BinaryVector-3.3", "HeuristicLab.Problems.BinaryVector\3.3\HeuristicLab.Problems.BinaryVector-3.3.csproj", "{FC627BE5-0F93-47D8-BD2E-530EA2B8AA5F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Binary-3.3", "HeuristicLab.Problems.Binary\3.3\HeuristicLab.Problems.Binary-3.3.csproj", "{FC627BE5-0F93-47D8-BD2E-530EA2B8AA5F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.ALPS-3.3", "HeuristicLab.Algorithms.ALPS\3.3\HeuristicLab.Algorithms.ALPS-3.3.csproj", "{59F354CB-FE13-4253-AED2-AD86372BEC27}"
@@ -2117 +2117 @@
     HideSolutionNode = FALSE
   EndGlobalSection
+  GlobalSection(NestedProjects) = preSolution
+    {F62BCD22-FB83-4444-9401-8031C2487A86} = {7EB6A587-BD45-40F2-BB15-4A69677A326C}
+    {4FE983A1-AAF8-4977-B9E2-52B3224510CB} = {7EB6A587-BD45-40F2-BB15-4A69677A326C}
+    {25735DB4-8E54-4A2C-83E3-A60C76565E55} = {7EB6A587-BD45-40F2-BB15-4A69677A326C}
+    {3081630C-9521-47D7-8075-1777C12F212C} = {7EB6A587-BD45-40F2-BB15-4A69677A326C}
+    {B7A64A60-B538-479F-9C47-A3180C458F6C} = {7EB6A587-BD45-40F2-BB15-4A69677A326C}
+  EndGlobalSection
 EndGlobal