Changeset 15146


Ignore:
Timestamp:
07/06/17 11:25:19 (2 weeks ago)
Author:
gkronber
Message:

#745: merged r14846,14847,r14871 from trunk to stable

Location:
stable
Files:
3 deleted
2 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable/HeuristicLab 3.3.sln

    r14212 r15146  
    9393    {B94FFB82-43D4-40AB-9980-B03470ADF221} = {B94FFB82-43D4-40AB-9980-B03470ADF221}
    9494    {06D4A186-9319-48A0-BADE-A2058D462EEA} = {06D4A186-9319-48A0-BADE-A2058D462EEA}
     95    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9} = {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}
    9596    {5B9B9E8C-2706-43C2-80B8-A08341E431F7} = {5B9B9E8C-2706-43C2-80B8-A08341E431F7}
    9697    {997F018D-AEA2-4F21-9301-82FAF6A5612D} = {997F018D-AEA2-4F21-9301-82FAF6A5612D}
     
    446447EndProject
    447448Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.BinPacking-3.3", "HeuristicLab.Problems.BinPacking\3.3\HeuristicLab.Problems.BinPacking-3.3.csproj", "{F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}"
     449EndProject
     450Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.DataAnalysis.Glmnet", "HeuristicLab.Algorithms.DataAnalysis.Glmnet\3.4\HeuristicLab.Algorithms.DataAnalysis.Glmnet.csproj", "{4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}"
    448451EndProject
    449452Global
     
    21732176    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Release|x86.ActiveCfg = Release|x86
    21742177    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Release|x86.Build.0 = Release|x86
     2178    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2179    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2180    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}.Debug|x64.ActiveCfg = Debug|x64
     2181    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}.Debug|x64.Build.0 = Debug|x64
     2182    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}.Debug|x86.ActiveCfg = Debug|x86
     2183    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}.Debug|x86.Build.0 = Debug|x86
     2184    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2185    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}.Release|Any CPU.Build.0 = Release|Any CPU
     2186    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}.Release|x64.ActiveCfg = Release|x64
     2187    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}.Release|x64.Build.0 = Release|x64
     2188    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}.Release|x86.ActiveCfg = Release|x86
     2189    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}.Release|x86.Build.0 = Release|x86
    21752190  EndGlobalSection
    21762191  GlobalSection(SolutionProperties) = preSolution
  • stable/HeuristicLab.Algorithms.DataAnalysis.Glmnet/3.4/HeuristicLab.Algorithms.DataAnalysis.Glmnet.csproj

    r14846 r15146  
    2020    <DebugType>full</DebugType>
    2121    <Optimize>false</Optimize>
    22     <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     22    <OutputPath>..\..\bin\</OutputPath>
    2323    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2424    <ErrorReport>prompt</ErrorReport>
     
    3030    <DebugType>pdbonly</DebugType>
    3131    <Optimize>true</Optimize>
    32     <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     32    <OutputPath>..\..\bin\</OutputPath>
    3333    <DefineConstants>TRACE</DefineConstants>
    3434    <ErrorReport>prompt</ErrorReport>
     
    4646  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    4747    <DebugSymbols>true</DebugSymbols>
    48     <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     48    <OutputPath>..\..\bin\</OutputPath>
    4949    <DefineConstants>DEBUG;TRACE</DefineConstants>
    5050    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     
    5454  </PropertyGroup>
    5555  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    56     <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     56    <OutputPath>..\..\bin\</OutputPath>
    5757    <DefineConstants>TRACE</DefineConstants>
    5858    <Optimize>true</Optimize>
     
    6363  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    6464    <DebugSymbols>true</DebugSymbols>
    65     <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     65    <OutputPath>..\..\bin\</OutputPath>
    6666    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6767    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     
    7171  </PropertyGroup>
    7272  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    73     <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     73    <OutputPath>..\..\bin\</OutputPath>
    7474    <DefineConstants>TRACE</DefineConstants>
    7575    <Optimize>true</Optimize>
Note: See TracChangeset for help on using the changeset viewer.