Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/16/12 16:28:49 (12 years ago)
Author:
gkronber
Message:

merged r7609:7840 from trunk into time series branch

Location:
branches/HeuristicLab.TimeSeries
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.TimeSeries

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

    r7615 r7842  
    115115    <Reference Include="System.Data" />
    116116    <Reference Include="System.Xml" />
    117     <Reference Include="WeifenLuo.WinFormsUI.Docking-2.3.1, Version=2.3.1.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
     117    <Reference Include="WeifenLuo.WinFormsUI.Docking-2.3.1, Version=2.3.1.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     118      <Private>False</Private>
     119    </Reference>
    118120  </ItemGroup>
    119121  <ItemGroup>
    … …  
    138140    </Compile>
    139141    <Compile Include="Plugin.cs" />
    140     <Compile Include="ProblemInstanceProviderView.cs">
    141       <SubType>UserControl</SubType>
    142     </Compile>
    143     <Compile Include="ProblemInstanceProviderView.Designer.cs">
    144       <DependentUpon>ProblemInstanceProviderView.cs</DependentUpon>
    145     </Compile>
    146142    <Compile Include="ProblemView.cs">
    147143      <SubType>UserControl</SubType>
    … …  
    264260      <DependentUpon>EngineAlgorithmView.cs</DependentUpon>
    265261    </Compile>
    266     <Compile Include="HeuristicOptimizationProblemView.cs">
    267       <SubType>UserControl</SubType>
    268     </Compile>
    269     <Compile Include="HeuristicOptimizationProblemView.Designer.cs">
    270       <DependentUpon>HeuristicOptimizationProblemView.cs</DependentUpon>
    271     </Compile>
    272262    <Compile Include="Properties\AssemblyInfo.cs" />
    273263    <Compile Include="ResultCollectionView.cs">
    … …  
    287277    <None Include="HeuristicLab.snk" />
    288278    <None Include="Properties\AssemblyInfo.cs.frame" />
    289   </ItemGroup>
    290   <ItemGroup>
    291     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    292       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    293       <Name>HeuristicLab.Collections-3.3</Name>
    294       <Private>False</Private>
    295     </ProjectReference>
    296     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    297       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    298       <Name>HeuristicLab.Common.Resources-3.3</Name>
    299       <Private>False</Private>
    300     </ProjectReference>
    301     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    302       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    303       <Name>HeuristicLab.Common-3.3</Name>
    304       <Private>False</Private>
    305     </ProjectReference>
    306     <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    307       <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    308       <Name>HeuristicLab.Core.Views-3.3</Name>
    309       <Private>False</Private>
    310     </ProjectReference>
    311     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    312       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    313       <Name>HeuristicLab.Core-3.3</Name>
    314       <Private>False</Private>
    315     </ProjectReference>
    316     <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
    317       <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
    318       <Name>HeuristicLab.Data.Views-3.3</Name>
    319       <Private>False</Private>
    320     </ProjectReference>
    321     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    322       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    323       <Name>HeuristicLab.Data-3.3</Name>
    324       <Private>False</Private>
    325     </ProjectReference>
    326     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    327       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    328       <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
    329       <Private>False</Private>
    330     </ProjectReference>
    331     <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    332       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    333       <Name>HeuristicLab.MainForm-3.3</Name>
    334       <Private>False</Private>
    335     </ProjectReference>
    336     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    337       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    338       <Name>HeuristicLab.Optimization-3.3</Name>
    339       <Private>False</Private>
    340     </ProjectReference>
    341     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    342       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    343       <Name>HeuristicLab.Persistence-3.3</Name>
    344       <Private>False</Private>
    345     </ProjectReference>
    346     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    347       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    348       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    349       <Private>False</Private>
    350     </ProjectReference>
    351     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    352       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    353       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    354     </ProjectReference>
    355     <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
    356       <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
    357       <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
    358       <Private>False</Private>
    359     </ProjectReference>
    360279  </ItemGroup>
    361280  <ItemGroup>
    … …  
    375294      <Install>true</Install>
    376295    </BootstrapperPackage>
     296  </ItemGroup>
     297  <ItemGroup>
     298    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     299      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     300      <Name>HeuristicLab.Collections-3.3</Name>
     301      <Private>False</Private>
     302    </ProjectReference>
     303    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
     304      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
     305      <Name>HeuristicLab.Common.Resources-3.3</Name>
     306      <Private>False</Private>
     307    </ProjectReference>
     308    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     309      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     310      <Name>HeuristicLab.Common-3.3</Name>
     311      <Private>False</Private>
     312    </ProjectReference>
     313    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
     314      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
     315      <Name>HeuristicLab.Core.Views-3.3</Name>
     316      <Private>False</Private>
     317    </ProjectReference>
     318    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     319      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     320      <Name>HeuristicLab.Core-3.3</Name>
     321      <Private>False</Private>
     322    </ProjectReference>
     323    <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
     324      <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
     325      <Name>HeuristicLab.Data.Views-3.3</Name>
     326      <Private>False</Private>
     327    </ProjectReference>
     328    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     329      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     330      <Name>HeuristicLab.Data-3.3</Name>
     331      <Private>False</Private>
     332    </ProjectReference>
     333    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
     334      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
     335      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     336      <Private>False</Private>
     337    </ProjectReference>
     338    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
     339      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
     340      <Name>HeuristicLab.MainForm-3.3</Name>
     341      <Private>False</Private>
     342    </ProjectReference>
     343    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     344      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     345      <Name>HeuristicLab.Optimization-3.3</Name>
     346      <Private>False</Private>
     347    </ProjectReference>
     348    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     349      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     350      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     351      <Private>False</Private>
     352    </ProjectReference>
     353    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances.Views\3.3\HeuristicLab.Problems.Instances.Views-3.3.csproj">
     354      <Project>{B1BA398F-953F-4C3A-B07B-1E5E17A27DD9}</Project>
     355      <Name>HeuristicLab.Problems.Instances.Views-3.3</Name>
     356    </ProjectReference>
     357    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     358      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
     359      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     360      <Private>False</Private>
     361    </ProjectReference>
     362    <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
     363      <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
     364      <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
     365      <Private>False</Private>
     366    </ProjectReference>
    377367  </ItemGroup>
    378368  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Note: See TracChangeset for help on using the changeset viewer.