Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/07/11 23:45:06 (13 years ago)
Author:
abeham
Message:

#1619, #1628

  • reintegrated changes from branch
Location:
trunk/sources/HeuristicLab.Problems.QuadraticAssignment.Views
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Problems.QuadraticAssignment.Views

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/GP.Grammar.Editor/HeuristicLab.Problems.QuadraticAssignment.Viewsmergedeligible
      /branches/GeneralizedQAP/HeuristicLab.Problems.QuadraticAssignment.Viewsmergedeligible
      /branches/CloningRefactoring/HeuristicLab.Problems.QuadraticAssignment.Views4656-4721
      /branches/DataAnalysis Refactoring/HeuristicLab.Problems.QuadraticAssignment.Views5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.QuadraticAssignment.Views5815-6180
      /branches/DataAnalysis/HeuristicLab.Problems.QuadraticAssignment.Views4458-4459,​4462,​4464
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.QuadraticAssignment.Views5060
      /branches/NET40/sources/HeuristicLab.Problems.QuadraticAssignment.Views5138-5162
      /branches/ParallelEngine/HeuristicLab.Problems.QuadraticAssignment.Views5175-5192
      /branches/QAPAlgorithms/HeuristicLab.Problems.QuadraticAssignment.Views6350-6627
      /branches/Restructure trunk solution/HeuristicLab.Problems.QuadraticAssignment.Views6828
      /branches/SuccessProgressAnalysis/HeuristicLab.Problems.QuadraticAssignment.Views5370-5682
      /branches/Trunk/HeuristicLab.Problems.QuadraticAssignment.Views6829-6865
      /branches/VNS/HeuristicLab.Problems.QuadraticAssignment.Views5594-5752
      /branches/histogram/HeuristicLab.Problems.QuadraticAssignment.Views5959-6341

  • trunk/sources/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/HeuristicLab.Problems.QuadraticAssignment.Views-3.3.csproj

    r6866 r6891  
    104104    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
    105105    <Reference Include="HeuristicLab.Data.Views-3.3">
    106       <HintPath>..\..\HeuristicLab.Data.Views\3.3\bin\x86\Debug\HeuristicLab.Data.Views-3.3.dll</HintPath>
     106      <HintPath>..\..\HeuristicLab.Data.Views\3.3\bin\Debug\HeuristicLab.Data.Views-3.3.dll</HintPath>
    107107    </Reference>
    108108    <Reference Include="HeuristicLab.Visualization.ChartControlsExtensions-3.3">
    109       <HintPath>..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\bin\x86\Debug\HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll</HintPath>
     109      <HintPath>..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\bin\Debug\HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll</HintPath>
    110110    </Reference>
    111111    <Reference Include="System" />
    … …  
    113113    <Reference Include="System.Data" />
    114114    <Reference Include="System.Drawing" />
     115    <Reference Include="System.Runtime.Serialization" />
     116    <Reference Include="System.ServiceModel" />
    115117    <Reference Include="System.Windows.Forms" />
    116118    <Reference Include="System.Windows.Forms.DataVisualization" />
    117     <Reference Include="System.Xml" />
    118119  </ItemGroup>
    119120  <ItemGroup>
    … …  
    210211      <Private>False</Private>
    211212    </ProjectReference>
     213  </ItemGroup>
     214  <ItemGroup>
     215    <WCFMetadata Include="Service References\" />
    212216  </ItemGroup>
    213217  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Note: See TracChangeset for help on using the changeset viewer.