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:
1 deleted
3 edited
1 copied

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.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446.csproj

    r5163 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>
     
    5050    <DebugType>pdbonly</DebugType>
    5151    <Optimize>true</Optimize>
    52     <OutputPath>bin\Release\</OutputPath>
     52    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5353    <DefineConstants>TRACE</DefineConstants>
    5454    <ErrorReport>prompt</ErrorReport>
     
    5858  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    5959    <DebugSymbols>true</DebugSymbols>
    60     <OutputPath>bin\x86\Debug\</OutputPath>
     60    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6161    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6262    <DebugType>full</DebugType>
     
    6666  </PropertyGroup>
    6767  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    68     <OutputPath>bin\x86\Release\</OutputPath>
     68    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6969    <DefineConstants>TRACE</DefineConstants>
    7070    <Optimize>true</Optimize>
     
    7676  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    7777    <DebugSymbols>true</DebugSymbols>
    78     <OutputPath>bin\x64\Debug\</OutputPath>
     78    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7979    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8080    <DebugType>full</DebugType>
     
    8484  </PropertyGroup>
    8585  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    86     <OutputPath>bin\x64\Release\</OutputPath>
     86    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8787    <DefineConstants>TRACE</DefineConstants>
    8888    <Optimize>true</Optimize>
     
    119119    <Compile Include="Controller.cs" />
    120120    <Compile Include="Ghosts.cs" />
    121     <Compile Include="HeuristicLabNetronPlugin.cs" />
     121    <Compile Include="Plugin.cs" />
    122122    <Compile Include="Properties\AssemblyInfo.cs" />
    123123    <Compile Include="TextEditor.cs" />
     
    132132      <Project>{96AEBBEE-4203-45F3-BCF5-7B73BF256BDA}</Project>
    133133      <Name>Netron.Diagramming.Core-3.0.2672.12446</Name>
     134      <Private>False</Private>
    134135    </ProjectReference>
    135136  </ItemGroup>
  • trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446.csproj

    r5163 r6866  
    4848  </PropertyGroup>
    4949  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    50     <OutputPath>bin\Debug\</OutputPath>
     50    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5151    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
    5252    <BaseAddress>285212672</BaseAddress>
     
    7676  </PropertyGroup>
    7777  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    78     <OutputPath>bin\Release\</OutputPath>
     78    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7979    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
    8080    <BaseAddress>285212672</BaseAddress>
     
    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    <BaseAddress>285212672</BaseAddress>
     
    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    <BaseAddress>285212672</BaseAddress>
     
    132132  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    133133    <DebugSymbols>true</DebugSymbols>
    134     <OutputPath>bin\x64\Debug\</OutputPath>
     134    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    135135    <DefineConstants>DEBUG;TRACE</DefineConstants>
    136136    <BaseAddress>285212672</BaseAddress>
     
    146146  </PropertyGroup>
    147147  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    148     <OutputPath>bin\x64\Release\</OutputPath>
     148    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    149149    <DefineConstants>TRACE</DefineConstants>
    150150    <BaseAddress>285212672</BaseAddress>
Note: See TracChangeset for help on using the changeset viewer.