Ignore:
Timestamp:
07/21/16 17:21:54 (3 years ago)
Author:
mkommend
Message:

#1087: Merged r14120, r14121, r14122, r14124, r14125, r14126, r14127, r14130, r14132, r14150, r14164 into stable.

Location:
stable
Files:
3 edited
2 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Problems.TestFunctions.Views/3.3/HeuristicLab.Problems.TestFunctions.Views-3.3.csproj

    r11920 r14165  
    105105    <Reference Include="System.Drawing" />
    106106    <Reference Include="System.Windows.Forms" />
     107    <Reference Include="System.Windows.Forms.DataVisualization" />
    107108    <Reference Include="System.Xml.Linq">
    108109      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     
    115116  </ItemGroup>
    116117  <ItemGroup>
     118    <Compile Include="MultiObjectiveTestFunctionParetoFrontScatterPlotView.cs">
     119      <SubType>UserControl</SubType>
     120    </Compile>
     121    <Compile Include="MultiObjectiveTestFunctionParetoFrontScatterPlotView.Designer.cs">
     122      <DependentUpon>MultiObjectiveTestFunctionParetoFrontScatterPlotView.cs</DependentUpon>
     123    </Compile>
    117124    <Compile Include="Plugin.cs" />
    118125    <Compile Include="Properties\AssemblyInfo.cs" />
     
    196203      <Private>False</Private>
    197204    </ProjectReference>
     205    <ProjectReference Include="..\..\HeuristicLab.Problems.TestFunctions.MultiObjective\3.3\HeuristicLab.Problems.TestFunctions.MultiObjective-3.3.csproj">
     206      <Project>{d53e8e48-cfaa-4f57-ac35-63bef4476159}</Project>
     207      <Name>HeuristicLab.Problems.TestFunctions.MultiObjective-3.3</Name>
     208      <Private>False</Private>
     209    </ProjectReference>
    198210    <ProjectReference Include="..\..\HeuristicLab.Problems.TestFunctions\3.3\HeuristicLab.Problems.TestFunctions-3.3.csproj">
    199211      <Project>{88B9B0E3-344E-4196-82A3-0F9732506FE8}</Project>
    200212      <Name>HeuristicLab.Problems.TestFunctions-3.3</Name>
     213      <Private>False</Private>
     214    </ProjectReference>
     215    <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
     216      <Project>{315bda09-3f4f-49b3-9790-b37cfc1c5750}</Project>
     217      <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
    201218      <Private>False</Private>
    202219    </ProjectReference>
  • stable/HeuristicLab.Problems.TestFunctions.Views/3.3/MultiObjectiveTestFunctionParetoFrontScatterPlotView.Designer.cs

    r14122 r14165  
    1919 */
    2020#endregion
    21 namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
     21
     22namespace HeuristicLab.Problems.TestFunctions.Views {
    2223  partial class MultiObjectiveTestFunctionParetoFrontScatterPlotView {
    2324    /// <summary>
  • stable/HeuristicLab.Problems.TestFunctions.Views/3.3/MultiObjectiveTestFunctionParetoFrontScatterPlotView.cs

    r14122 r14165  
    2727using HeuristicLab.Core.Views;
    2828using HeuristicLab.MainForm;
    29 
    30 namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
     29using HeuristicLab.Problems.TestFunctions.MultiObjective;
     30
     31namespace HeuristicLab.Problems.TestFunctions.Views {
    3132  [View("Scatter Plot")]
    3233  [Content(typeof(ScatterPlotContent))]
  • stable/HeuristicLab.Problems.TestFunctions.Views/3.3/Plugin.cs.frame

    r13316 r14165  
    3939  [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
    4040  [PluginDependency("HeuristicLab.Problems.TestFunctions", "3.3")]
     41  [PluginDependency("HeuristicLab.Problems.TestFunctions.MultiObjective", "3.3")]
     42  [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions", "3.3")]
    4143  public class HeuristicLabProblemsTestFunctionsViewsPlugin : PluginBase {
    4244  }
Note: See TracChangeset for help on using the changeset viewer.