Changeset 13285 for stable/HeuristicLab 3.3.sln

Timestamp:

11/19/15 11:56:45 (8 years ago)

Author:

ascheibe

Message:

#2269 merged r13214, r13217, r13223, r13224, r13226, r13228, r13231, r13232, r13260 into stable

Location:

stable

Files:

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

stable/HeuristicLab 3.3.sln

@@ -26 +26 @@
     {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2} = {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}
     {E2419315-B10A-4BC1-B517-A24DCF4C59AC} = {E2419315-B10A-4BC1-B517-A24DCF4C59AC}
+    {9372D115-D933-40D2-BD29-A2C1EAC35874} = {9372D115-D933-40D2-BD29-A2C1EAC35874}
     {B7FA451C-26BF-4EE5-8E0E-BECAADA5B8E9} = {B7FA451C-26BF-4EE5-8E0E-BECAADA5B8E9}
     {E226881D-315F-423D-B419-A766FE0D8685} = {E226881D-315F-423D-B419-A766FE0D8685}
@@ -93 +94 @@
     {5B9B9E8C-2706-43C2-80B8-A08341E431F7} = {5B9B9E8C-2706-43C2-80B8-A08341E431F7}
     {997F018D-AEA2-4F21-9301-82FAF6A5612D} = {997F018D-AEA2-4F21-9301-82FAF6A5612D}
+    {26349C8D-72A1-4BAE-95A3-14E96A3B4AE8} = {26349C8D-72A1-4BAE-95A3-14E96A3B4AE8}
     {D767C38D-8014-46B0-9A32-03A3AECCE34A} = {D767C38D-8014-46B0-9A32-03A3AECCE34A}
     {B1BA398F-953F-4C3A-B07B-1E5E17A27DD9} = {B1BA398F-953F-4C3A-B07B-1E5E17A27DD9}
@@ -128 +130 @@
     {79271BC8-4446-40E2-BB89-9BE4E17174FE} = {79271BC8-4446-40E2-BB89-9BE4E17174FE}
     {BBF2CCC8-4D87-4297-8E18-8241FF93F966} = {BBF2CCC8-4D87-4297-8E18-8241FF93F966}
+    {59F354CB-FE13-4253-AED2-AD86372BEC27} = {59F354CB-FE13-4253-AED2-AD86372BEC27}
     {D1EFA4CC-909F-41D5-9C1F-C3AF1957A372} = {D1EFA4CC-909F-41D5-9C1F-C3AF1957A372}
     {7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086} = {7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086}
@@ -143 +146 @@
     {FC627BE5-0F93-47D8-BD2E-530EA2B8AA5F} = {FC627BE5-0F93-47D8-BD2E-530EA2B8AA5F}
     {C3AD50E6-E717-490E-ABC7-32EF7FB03C97} = {C3AD50E6-E717-490E-ABC7-32EF7FB03C97}
+    {1D41EAE6-CC79-41D4-858C-589C4DB5E50D} = {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}
     {C9CF6AE8-4637-4A75-9141-042F479B5D50} = {C9CF6AE8-4637-4A75-9141-042F479B5D50}
     {BF1E4DF4-A4CC-451F-9D50-303F405E265E} = {BF1E4DF4-A4CC-451F-9D50-303F405E265E}
@@ -148 +152 @@
     {494F87F4-0F25-4D33-A382-10CDB2174D48} = {494F87F4-0F25-4D33-A382-10CDB2174D48}
     {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937} = {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}
+    {02CDDBF5-42A7-4C40-AE6C-E5D29AC9CCEC} = {02CDDBF5-42A7-4C40-AE6C-E5D29AC9CCEC}
     {6AE0E1F5-D3FF-43A3-90E1-2435E7493FB5} = {6AE0E1F5-D3FF-43A3-90E1-2435E7493FB5}
     {EE07BFF8-B23D-41F5-8AD7-AC9598D7A2C9} = {EE07BFF8-B23D-41F5-8AD7-AC9598D7A2C9}
@@ -437 +442 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.GeneticProgramming.Views-3.3", "HeuristicLab.Problems.GeneticProgramming.Views\3.3\HeuristicLab.Problems.GeneticProgramming.Views-3.3.csproj", "{26349C8D-72A1-4BAE-95A3-14E96A3B4AE8}"
+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}"
 EndProject
 Global
@@ -2140 +2147 @@
     {26349C8D-72A1-4BAE-95A3-14E96A3B4AE8}.Release|x86.ActiveCfg = Release|x86
     {26349C8D-72A1-4BAE-95A3-14E96A3B4AE8}.Release|x86.Build.0 = Release|x86
+    {59F354CB-FE13-4253-AED2-AD86372BEC27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {59F354CB-FE13-4253-AED2-AD86372BEC27}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {59F354CB-FE13-4253-AED2-AD86372BEC27}.Debug|x64.ActiveCfg = Debug|x64
+    {59F354CB-FE13-4253-AED2-AD86372BEC27}.Debug|x64.Build.0 = Debug|x64
+    {59F354CB-FE13-4253-AED2-AD86372BEC27}.Debug|x86.ActiveCfg = Debug|x86
+    {59F354CB-FE13-4253-AED2-AD86372BEC27}.Debug|x86.Build.0 = Debug|x86
+    {59F354CB-FE13-4253-AED2-AD86372BEC27}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {59F354CB-FE13-4253-AED2-AD86372BEC27}.Release|Any CPU.Build.0 = Release|Any CPU
+    {59F354CB-FE13-4253-AED2-AD86372BEC27}.Release|x64.ActiveCfg = Release|x64
+    {59F354CB-FE13-4253-AED2-AD86372BEC27}.Release|x64.Build.0 = Release|x64
+    {59F354CB-FE13-4253-AED2-AD86372BEC27}.Release|x86.ActiveCfg = Release|x86
+    {59F354CB-FE13-4253-AED2-AD86372BEC27}.Release|x86.Build.0 = Release|x86
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution
@@ -2145 +2164 @@
   EndGlobalSection
   GlobalSection(NestedProjects) = preSolution
+    {0C67A033-F6D9-4237-B3CA-C033A44706BE} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}
     {3083C7AA-5AF4-4C75-BA19-B69B86E2F66A} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}
     {9A04599C-D608-4240-8DA6-D41F51C515A3} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}