Changeset 9856
- Timestamp:
- 08/07/13 07:16:28 (11 years ago)
- Location:
- stable
- Files:
-
- 3 deleted
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 9741,9762
- Property svn:mergeinfo changed
-
stable/HeuristicLab 3.3.sln
r9736 r9856 97 97 {4FE983A1-AAF8-4977-B9E2-52B3224510CB} = {4FE983A1-AAF8-4977-B9E2-52B3224510CB} 98 98 {8C426FA3-6614-412C-B669-BCE58DB9710E} = {8C426FA3-6614-412C-B669-BCE58DB9710E} 99 {6410BDA6-3641-42B2-BABA-AA626E2F6F71} = {6410BDA6-3641-42B2-BABA-AA626E2F6F71}100 99 {068C70A7-8CAF-4AB6-8721-4564D62292BC} = {068C70A7-8CAF-4AB6-8721-4564D62292BC} 101 100 {3083C7AA-5AF4-4C75-BA19-B69B86E2F66A} = {3083C7AA-5AF4-4C75-BA19-B69B86E2F66A} … … 125 124 {88B9B0E3-344E-4196-82A3-0F9732506FE8} = {88B9B0E3-344E-4196-82A3-0F9732506FE8} 126 125 {AE5B1CE5-9862-4D6F-A700-D72CD9AEA295} = {AE5B1CE5-9862-4D6F-A700-D72CD9AEA295} 127 {D1386FE7-682D-4E18-8C4F-CFD423FA5DD0} = {D1386FE7-682D-4E18-8C4F-CFD423FA5DD0}128 126 {C9CF6AE8-4637-4A75-9141-042F479B5D50} = {C9CF6AE8-4637-4A75-9141-042F479B5D50} 129 127 {BF1E4DF4-A4CC-451F-9D50-303F405E265E} = {BF1E4DF4-A4CC-451F-9D50-303F405E265E} … … 231 229 EndProject 232 230 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.ExternalEvaluation.Views-3.3", "HeuristicLab.Problems.ExternalEvaluation.Views\3.3\HeuristicLab.Problems.ExternalEvaluation.Views-3.3.csproj", "{3081630C-9521-47D7-8075-1777C12F212C}" 233 EndProject234 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.VehicleRouting-3.3", "HeuristicLab.Problems.VehicleRouting\3.3\HeuristicLab.Problems.VehicleRouting-3.3.csproj", "{6410BDA6-3641-42B2-BABA-AA626E2F6F71}"235 EndProject236 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.VehicleRouting.Views-3.3", "HeuristicLab.Problems.VehicleRouting.Views\3.3\HeuristicLab.Problems.VehicleRouting.Views-3.3.csproj", "{D1386FE7-682D-4E18-8C4F-CFD423FA5DD0}"237 231 EndProject 238 232 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Common-3.3", "HeuristicLab.Clients.Common\3.3\HeuristicLab.Clients.Common-3.3.csproj", "{730A9104-D4D1-4360-966B-E49B7571DDA3}" … … 989 983 {3081630C-9521-47D7-8075-1777C12F212C}.Release|x86.ActiveCfg = Release|x86 990 984 {3081630C-9521-47D7-8075-1777C12F212C}.Release|x86.Build.0 = Release|x86 991 {6410BDA6-3641-42B2-BABA-AA626E2F6F71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU992 {6410BDA6-3641-42B2-BABA-AA626E2F6F71}.Debug|Any CPU.Build.0 = Debug|Any CPU993 {6410BDA6-3641-42B2-BABA-AA626E2F6F71}.Debug|x64.ActiveCfg = Debug|x64994 {6410BDA6-3641-42B2-BABA-AA626E2F6F71}.Debug|x64.Build.0 = Debug|x64995 {6410BDA6-3641-42B2-BABA-AA626E2F6F71}.Debug|x86.ActiveCfg = Debug|x86996 {6410BDA6-3641-42B2-BABA-AA626E2F6F71}.Debug|x86.Build.0 = Debug|x86997 {6410BDA6-3641-42B2-BABA-AA626E2F6F71}.Release|Any CPU.ActiveCfg = Release|Any CPU998 {6410BDA6-3641-42B2-BABA-AA626E2F6F71}.Release|Any CPU.Build.0 = Release|Any CPU999 {6410BDA6-3641-42B2-BABA-AA626E2F6F71}.Release|x64.ActiveCfg = Release|x641000 {6410BDA6-3641-42B2-BABA-AA626E2F6F71}.Release|x64.Build.0 = Release|x641001 {6410BDA6-3641-42B2-BABA-AA626E2F6F71}.Release|x86.ActiveCfg = Release|x861002 {6410BDA6-3641-42B2-BABA-AA626E2F6F71}.Release|x86.Build.0 = Release|x861003 {D1386FE7-682D-4E18-8C4F-CFD423FA5DD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU1004 {D1386FE7-682D-4E18-8C4F-CFD423FA5DD0}.Debug|Any CPU.Build.0 = Debug|Any CPU1005 {D1386FE7-682D-4E18-8C4F-CFD423FA5DD0}.Debug|x64.ActiveCfg = Debug|x641006 {D1386FE7-682D-4E18-8C4F-CFD423FA5DD0}.Debug|x64.Build.0 = Debug|x641007 {D1386FE7-682D-4E18-8C4F-CFD423FA5DD0}.Debug|x86.ActiveCfg = Debug|x861008 {D1386FE7-682D-4E18-8C4F-CFD423FA5DD0}.Debug|x86.Build.0 = Debug|x861009 {D1386FE7-682D-4E18-8C4F-CFD423FA5DD0}.Release|Any CPU.ActiveCfg = Release|Any CPU1010 {D1386FE7-682D-4E18-8C4F-CFD423FA5DD0}.Release|Any CPU.Build.0 = Release|Any CPU1011 {D1386FE7-682D-4E18-8C4F-CFD423FA5DD0}.Release|x64.ActiveCfg = Release|x641012 {D1386FE7-682D-4E18-8C4F-CFD423FA5DD0}.Release|x64.Build.0 = Release|x641013 {D1386FE7-682D-4E18-8C4F-CFD423FA5DD0}.Release|x86.ActiveCfg = Release|x861014 {D1386FE7-682D-4E18-8C4F-CFD423FA5DD0}.Release|x86.Build.0 = Release|x861015 985 {730A9104-D4D1-4360-966B-E49B7571DDA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 1016 986 {730A9104-D4D1-4360-966B-E49B7571DDA3}.Debug|Any CPU.Build.0 = Debug|Any CPU … … 1845 1815 HideSolutionNode = FALSE 1846 1816 EndGlobalSection 1847 GlobalSection(NestedProjects) = preSolution1848 {D1386FE7-682D-4E18-8C4F-CFD423FA5DD0} = {7EB6A587-BD45-40F2-BB15-4A69677A326C}1849 {6410BDA6-3641-42B2-BABA-AA626E2F6F71} = {7EB6A587-BD45-40F2-BB15-4A69677A326C}1850 EndGlobalSection1851 1817 EndGlobal -
stable/HeuristicLab.ExtLibs.sln
r9269 r9856 23 23 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.ProtobufCS-2.4.1.473", "HeuristicLab.ExtLibs\HeuristicLab.ProtobufCS\2.4.1\HeuristicLab.ProtobufCS\HeuristicLab.ProtobufCS-2.4.1.473.csproj", "{236459CE-80CF-4991-972F-DE74C826BCCC}" 24 24 EndProject 25 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.ALGLIB-3.6.0", "HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.6.0\HeuristicLab.ALGLIB-3.6.0\HeuristicLab.ALGLIB-3.6.0.csproj", "{571A0EE4-C86A-40A6-8790-DA754D464EDC}"26 EndProject27 25 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibSVM-3.12", "HeuristicLab.ExtLibs\HeuristicLab.LibSVM\3.12\LibSVM-3.12\LibSVM-3.12.csproj", "{4C41E3A3-B2FD-46EA-98FB-F21433E58FBE}" 28 26 EndProject … … 42 40 EndProject 43 41 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.ALGLIB-3.7.0", "HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.7.0\HeuristicLab.ALGLIB-3.7.0\HeuristicLab.ALGLIB-3.7.0.csproj", "{6F1D7847-D610-4E52-A184-405DAEFA41A9}" 44 EndProject45 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ALGLIB-3.6.0", "HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.6.0\ALGLIB-3.6.0\ALGLIB-3.6.0.csproj", "{D863807E-4774-455E-85A4-96E7E6A8F68F}"46 42 EndProject 47 43 Global … … 151 147 {236459CE-80CF-4991-972F-DE74C826BCCC}.Release|x86.ActiveCfg = Release|x86 152 148 {236459CE-80CF-4991-972F-DE74C826BCCC}.Release|x86.Build.0 = Release|x86 153 {571A0EE4-C86A-40A6-8790-DA754D464EDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU154 {571A0EE4-C86A-40A6-8790-DA754D464EDC}.Debug|Any CPU.Build.0 = Debug|Any CPU155 {571A0EE4-C86A-40A6-8790-DA754D464EDC}.Debug|x64.ActiveCfg = Debug|x64156 {571A0EE4-C86A-40A6-8790-DA754D464EDC}.Debug|x64.Build.0 = Debug|x64157 {571A0EE4-C86A-40A6-8790-DA754D464EDC}.Debug|x86.ActiveCfg = Debug|x86158 {571A0EE4-C86A-40A6-8790-DA754D464EDC}.Debug|x86.Build.0 = Debug|x86159 {571A0EE4-C86A-40A6-8790-DA754D464EDC}.Release|Any CPU.ActiveCfg = Release|Any CPU160 {571A0EE4-C86A-40A6-8790-DA754D464EDC}.Release|Any CPU.Build.0 = Release|Any CPU161 {571A0EE4-C86A-40A6-8790-DA754D464EDC}.Release|x64.ActiveCfg = Release|x64162 {571A0EE4-C86A-40A6-8790-DA754D464EDC}.Release|x64.Build.0 = Release|x64163 {571A0EE4-C86A-40A6-8790-DA754D464EDC}.Release|x86.ActiveCfg = Release|x86164 {571A0EE4-C86A-40A6-8790-DA754D464EDC}.Release|x86.Build.0 = Release|x86165 149 {4C41E3A3-B2FD-46EA-98FB-F21433E58FBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 166 150 {4C41E3A3-B2FD-46EA-98FB-F21433E58FBE}.Debug|Any CPU.Build.0 = Debug|Any CPU … … 271 255 {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Release|x86.ActiveCfg = Release|x86 272 256 {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Release|x86.Build.0 = Release|x86 273 {D863807E-4774-455E-85A4-96E7E6A8F68F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU274 {D863807E-4774-455E-85A4-96E7E6A8F68F}.Debug|Any CPU.Build.0 = Debug|Any CPU275 {D863807E-4774-455E-85A4-96E7E6A8F68F}.Debug|x64.ActiveCfg = Debug|x64276 {D863807E-4774-455E-85A4-96E7E6A8F68F}.Debug|x64.Build.0 = Debug|x64277 {D863807E-4774-455E-85A4-96E7E6A8F68F}.Debug|x86.ActiveCfg = Debug|x86278 {D863807E-4774-455E-85A4-96E7E6A8F68F}.Debug|x86.Build.0 = Debug|x86279 {D863807E-4774-455E-85A4-96E7E6A8F68F}.Release|Any CPU.ActiveCfg = Release|Any CPU280 {D863807E-4774-455E-85A4-96E7E6A8F68F}.Release|Any CPU.Build.0 = Release|Any CPU281 {D863807E-4774-455E-85A4-96E7E6A8F68F}.Release|x64.ActiveCfg = Release|x64282 {D863807E-4774-455E-85A4-96E7E6A8F68F}.Release|x64.Build.0 = Release|x64283 {D863807E-4774-455E-85A4-96E7E6A8F68F}.Release|x86.ActiveCfg = Release|x86284 {D863807E-4774-455E-85A4-96E7E6A8F68F}.Release|x86.Build.0 = Release|x86285 257 EndGlobalSection 286 258 GlobalSection(SolutionProperties) = preSolution -
stable/HeuristicLab.Problems.DataAnalysis
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis merged: 9762
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4.csproj
r9288 r9856 96 96 <Private>False</Private> 97 97 </Reference> 98 <Reference Include="HeuristicLab.ALGLIB-3.6.0, Version=3.6.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">99 <Private>False</Private>100 </Reference>101 98 <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 102 99 <HintPath>..\..\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.dll</HintPath> -
stable/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj
r9507 r9856 95 95 <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 96 96 <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath> 97 <Private>False</Private>98 </Reference>99 <Reference Include="HeuristicLab.ALGLIB-3.6.0, Version=3.6.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">100 <HintPath>..\..\bin\HeuristicLab.ALGLIB-3.6.0.dll</HintPath>101 97 <Private>False</Private> 102 98 </Reference> -
stable/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.VehicleRouting (added) merged: 9741
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.VehicleRouting.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.VehicleRouting.Views (added) merged: 9741
- Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.