Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/30/17 16:41:06 (7 years ago)
Author:
pfleck
Message:

#2713 #2715 #2765
Merged to stable

  • 14435-14439,14493,14516,14519,14982,14987,14992,15042 (from #2713)
  • 14457-14458,14508,14582,14740,14984,15068,15095 (from #2715)
  • 14860-14861 (from #2765)
Location:
stable
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Analysis.Views

  • stable/HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj

    r11920 r15097  
    105105  </PropertyGroup>
    106106  <ItemGroup>
     107    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     108      <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
     109      <Private>False</Private>
     110    </Reference>
    107111    <Reference Include="System" />
    108112    <Reference Include="System.Core">
    … …  
    122126  </ItemGroup>
    123127  <ItemGroup>
     128    <Compile Include="DataTableView.cs">
     129      <SubType>UserControl</SubType>
     130    </Compile>
     131    <Compile Include="DataTableView.Designer.cs">
     132      <DependentUpon>DataTableView.cs</DependentUpon>
     133    </Compile>
     134    <Compile Include="ScatterPlotView.cs">
     135      <SubType>UserControl</SubType>
     136    </Compile>
     137    <Compile Include="ScatterPlotView.Designer.cs">
     138      <DependentUpon>ScatterPlotView.cs</DependentUpon>
     139    </Compile>
    124140    <Compile Include="ScatterPlotVisualPropertiesDialog.cs">
    125141      <SubType>Form</SubType>
    … …  
    140156      <DependentUpon>ScatterPlotDataRowVisualPropertiesControl.cs</DependentUpon>
    141157    </Compile>
    142     <Compile Include="ScatterPlotView.cs">
    143       <SubType>UserControl</SubType>
    144     </Compile>
    145     <Compile Include="ScatterPlotView.Designer.cs">
    146       <DependentUpon>ScatterPlotView.cs</DependentUpon>
    147     </Compile>
    148158    <Compile Include="ScatterPlotHistoryView.cs">
    149159      <SubType>UserControl</SubType>
    … …  
    209219    <Compile Include="Plugin.cs" />
    210220    <Compile Include="Properties\AssemblyInfo.cs" />
    211     <Compile Include="DataTableView.cs">
    212       <SubType>UserControl</SubType>
    213     </Compile>
    214     <Compile Include="DataTableView.Designer.cs">
    215       <DependentUpon>DataTableView.cs</DependentUpon>
    216     </Compile>
    217221    <Compile Include="HistogramControl.cs">
    218222      <SubType>UserControl</SubType>
Note: See TracChangeset for help on using the changeset viewer.