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.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

    r7615 r7842  
    135135    </Compile>
    136136    <Compile Include="Plugin.cs" />
     137    <Compile Include="Regression\RegressionEnsembleSolutionModelView.cs">
     138      <SubType>UserControl</SubType>
     139    </Compile>
     140    <Compile Include="Regression\RegressionEnsembleSolutionModelView.Designer.cs">
     141      <DependentUpon>RegressionEnsembleSolutionModelView.cs</DependentUpon>
     142    </Compile>
    137143    <Compile Include="Regression\RegressionSolutionErrorCharacteristicsCurveView.cs">
    138144      <SubType>UserControl</SubType>
     
    141147      <DependentUpon>RegressionSolutionErrorCharacteristicsCurveView.cs</DependentUpon>
    142148    </Compile>
    143     <Compile Include="Regression\RegressionEnsembleSolutionModelView.cs">
    144       <SubType>UserControl</SubType>
    145     </Compile>
    146     <Compile Include="Regression\RegressionEnsembleSolutionModelView.Designer.cs">
    147       <DependentUpon>RegressionEnsembleSolutionModelView.cs</DependentUpon>
     149    <Compile Include="Regression\RegressionSolutionEstimatedValuesView.cs">
     150      <SubType>UserControl</SubType>
     151    </Compile>
     152    <Compile Include="Regression\RegressionSolutionEstimatedValuesView.Designer.cs">
     153      <DependentUpon>RegressionSolutionEstimatedValuesView.cs</DependentUpon>
     154    </Compile>
     155    <Compile Include="Regression\RegressionSolutionLineChartView.cs">
     156      <SubType>UserControl</SubType>
     157    </Compile>
     158    <Compile Include="Regression\RegressionSolutionLineChartView.Designer.cs">
     159      <DependentUpon>RegressionSolutionLineChartView.cs</DependentUpon>
    148160    </Compile>
    149161    <Compile Include="Regression\RegressionSolutionResidualHistogram.cs">
     
    152164    <Compile Include="Regression\RegressionSolutionResidualHistogram.Designer.cs">
    153165      <DependentUpon>RegressionSolutionResidualHistogram.cs</DependentUpon>
     166    </Compile>
     167    <Compile Include="Regression\RegressionSolutionScatterPlotView.cs">
     168      <SubType>UserControl</SubType>
     169    </Compile>
     170    <Compile Include="Regression\RegressionSolutionScatterPlotView.Designer.cs">
     171      <DependentUpon>RegressionSolutionScatterPlotView.cs</DependentUpon>
    154172    </Compile>
    155173    <Compile Include="Solution Views\ClassificationSolutionView.cs">
     
    245263      <DependentUpon>RegressionSolutionView.cs</DependentUpon>
    246264    </Compile>
    247     <Compile Include="Regression\RegressionSolutionEstimatedValuesView.cs">
    248       <SubType>UserControl</SubType>
    249     </Compile>
    250     <Compile Include="Regression\RegressionSolutionEstimatedValuesView.Designer.cs">
    251       <DependentUpon>RegressionSolutionEstimatedValuesView.cs</DependentUpon>
    252     </Compile>
    253     <Compile Include="Regression\RegressionSolutionLineChartView.cs">
    254       <SubType>UserControl</SubType>
    255     </Compile>
    256     <Compile Include="Regression\RegressionSolutionLineChartView.Designer.cs">
    257       <DependentUpon>RegressionSolutionLineChartView.cs</DependentUpon>
    258     </Compile>
    259     <Compile Include="Regression\RegressionSolutionScatterPlotView.cs">
    260       <SubType>UserControl</SubType>
    261     </Compile>
    262     <Compile Include="Regression\RegressionSolutionScatterPlotView.Designer.cs">
    263       <DependentUpon>RegressionSolutionScatterPlotView.cs</DependentUpon>
    264     </Compile>
    265265    <Compile Include="TimeSeriesPrognosis\TimeSeriesPrognosisSolutionLineChartView.cs">
    266266      <SubType>UserControl</SubType>
     
    278278    <None Include="Plugin.cs.frame" />
    279279    <None Include="Properties\AssemblyInfo.cs.frame" />
    280     <Compile Include="DataAnalysisProblemView.cs">
    281       <SubType>UserControl</SubType>
    282     </Compile>
    283     <Compile Include="DataAnalysisProblemView.Designer.cs">
    284       <DependentUpon>DataAnalysisProblemView.cs</DependentUpon>
    285     </Compile>
    286280    <Compile Include="Properties\AssemblyInfo.cs" />
    287281  </ItemGroup>
     
    390384    </BootstrapperPackage>
    391385  </ItemGroup>
     386  <ItemGroup>
     387    <Folder Include="obj\" />
     388  </ItemGroup>
    392389  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    393390  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Note: See TracChangeset for help on using the changeset viewer.