Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/05/11 12:45:26 (13 years ago)
Author:
mkommend
Message:

#1653: Merged new HL solution into the trunk.

Location:
trunk/sources
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources

    • Property svn:ignore
      •  

        old new  
         1*.docstates
         2*.psess
        13*.resharper
        24*.suo
         5*.vsp
        36Google.ProtocolBuffers-0.9.1.dll
         7HeuristicLab 3.3.5.1.ReSharper.user
         8HeuristicLab 3.3.6.0.ReSharper.user
        49HeuristicLab.4.5.resharper.user
        510HeuristicLab.resharper.user
         
        813_ReSharper.HeuristicLab
        914_ReSharper.HeuristicLab 3.3
         15_ReSharper.HeuristicLab.ExtLibs
         16bin
        1017protoc.exe
        11 HeuristicLab 3.3.5.1.ReSharper.user
        12 *.psess
        13 *.vsp
        14 *.docstates
        15 bin
        16 HeuristicLab 3.3.6.0.ReSharper.user
         18HeuristicLab.ExtLibs.6.0.ReSharper.user
    • Property svn:mergeinfo changed
      /branches/Restructure trunk solution (added)merged: 6828
      /branches/Trunk (added)merged: 6829,​6831-6833,​6842-6848,​6850,​6865
  • trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtocolBuffers/ProtocolBuffers.csproj

    r6559 r6866  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>bin\Debug\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
     
    5151    <DebugType>pdbonly</DebugType>
    5252    <Optimize>true</Optimize>
    53     <OutputPath>bin\Release\</OutputPath>
     53    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5454    <DefineConstants>TRACE</DefineConstants>
    5555    <ErrorReport>prompt</ErrorReport>
     
    6969  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    7070    <DebugSymbols>true</DebugSymbols>
    71     <OutputPath>bin\x64\Debug\</OutputPath>
     71    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7272    <DefineConstants>DEBUG;TRACE</DefineConstants>
    7373    <NoStdLib>true</NoStdLib>
     
    8383  </PropertyGroup>
    8484  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    85     <OutputPath>bin\x64\Release\</OutputPath>
     85    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8686    <DefineConstants>TRACE</DefineConstants>
    8787    <Optimize>true</Optimize>
     
    8989    <DebugType>pdbonly</DebugType>
    9090    <PlatformTarget>x64</PlatformTarget>
    91     <CodeAnalysisLogFile>bin\Release\Google.ProtocolBuffers-0.9.1.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     91    <CodeAnalysisLogFile>$(SolutionDir)\bin\Google.ProtocolBuffers-0.9.1.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    9292    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    9393    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
     
    103103  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    104104    <DebugSymbols>true</DebugSymbols>
    105     <OutputPath>bin\x86\Debug\</OutputPath>
     105    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    106106    <DefineConstants>DEBUG;TRACE</DefineConstants>
    107107    <NoStdLib>true</NoStdLib>
     
    119119  </PropertyGroup>
    120120  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    121     <OutputPath>bin\x86\Release\</OutputPath>
     121    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    122122    <DefineConstants>TRACE</DefineConstants>
    123123    <Optimize>true</Optimize>
     
    125125    <DebugType>pdbonly</DebugType>
    126126    <PlatformTarget>x86</PlatformTarget>
    127     <CodeAnalysisLogFile>bin\Release\Google.ProtocolBuffers-0.9.1.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     127    <CodeAnalysisLogFile>$(SolutionDir)\bin\Google.ProtocolBuffers-0.9.1.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    128128    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    129129    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
Note: See TracChangeset for help on using the changeset viewer.