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/ProtoMunge/ProtoMunge.csproj

    r5163 r6866  
    3838    <DebugType>full</DebugType>
    3939    <Optimize>false</Optimize>
    40     <OutputPath>bin\Debug\</OutputPath>
     40    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4141    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4242    <ErrorReport>prompt</ErrorReport>
    … …  
    4747    <DebugType>pdbonly</DebugType>
    4848    <Optimize>true</Optimize>
    49     <OutputPath>bin\Release\</OutputPath>
     49    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5050    <DefineConstants>TRACE</DefineConstants>
    5151    <ErrorReport>prompt</ErrorReport>
    … …  
    6464  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6565    <DebugSymbols>true</DebugSymbols>
    66     <OutputPath>bin\x86\Debug\</OutputPath>
     66    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6767    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6868    <DebugType>full</DebugType>
    … …  
    7272  </PropertyGroup>
    7373  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    74     <OutputPath>bin\x86\Release\</OutputPath>
     74    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7575    <DefineConstants>TRACE</DefineConstants>
    7676    <Optimize>true</Optimize>
    … …  
    9191  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    9292    <DebugSymbols>true</DebugSymbols>
    93     <OutputPath>bin\x64\Debug\</OutputPath>
     93    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    9494    <DefineConstants>DEBUG;TRACE</DefineConstants>
    9595    <DebugType>full</DebugType>
    … …  
    9999  </PropertyGroup>
    100100  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    101     <OutputPath>bin\x64\Release\</OutputPath>
     101    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    102102    <DefineConstants>TRACE</DefineConstants>
    103103    <Optimize>true</Optimize>
    … …  
    127127      <Project>{6908BDCE-D925-43F3-94AC-A531E6DF2591}</Project>
    128128      <Name>ProtocolBuffers</Name>
    129     </ProjectReference>
     129  <Private>False</Private></ProjectReference>
    130130  </ItemGroup>
    131131  <ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.