Ignore:
Timestamp:
06/12/14 13:26:18 (6 years ago)
Author:
pfleck
Message:
  • Merged trunk into preprocessing branch.
Location:
branches/DataPreprocessing
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/DataPreprocessing

  • branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic.Views

  • branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj

    r9975 r11009  
    111111  <ItemGroup>
    112112    <Compile Include="Exporters\SymbolicSolutionExcelExporter.cs" />
    113     <Compile Include="InteractiveSymbolicExpressionTreeChart.cs">
    114       <SubType>UserControl</SubType>
    115     </Compile>
     113    <Compile Include="InteractiveSymbolicExpressionTreeChart.cs" />
    116114    <Compile Include="InteractiveSymbolicExpressionTreeChart.Designer.cs">
    117115      <DependentUpon>InteractiveSymbolicExpressionTreeChart.cs</DependentUpon>
    118116    </Compile>
    119     <Compile Include="MathSymbolicDataAnalysisModelView.cs">
    120       <SubType>UserControl</SubType>
    121     </Compile>
     117    <Compile Include="MathSymbolicDataAnalysisModelView.cs" />
    122118    <Compile Include="MathSymbolicDataAnalysisModelView.designer.cs">
    123119      <DependentUpon>MathSymbolicDataAnalysisModelView.cs</DependentUpon>
    124120    </Compile>
    125121    <Compile Include="Plugin.cs" />
    126     <Compile Include="TextualSymbolicDataAnalysisModelView.cs">
    127       <SubType>UserControl</SubType>
    128     </Compile>
     122    <Compile Include="TextualSymbolicDataAnalysisModelView.cs" />
    129123    <Compile Include="TextualSymbolicDataAnalysisModelView.designer.cs">
    130124      <DependentUpon>TextualSymbolicDataAnalysisModelView.cs</DependentUpon>
    131125    </Compile>
    132     <Compile Include="InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs">
    133       <SubType>UserControl</SubType>
    134     </Compile>
     126    <Compile Include="InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs" />
    135127    <Compile Include="InteractiveSymbolicDataAnalysisSolutionSimplifierView.Designer.cs">
    136128      <DependentUpon>InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs</DependentUpon>
    137129    </Compile>
    138     <Compile Include="GraphicalSymbolicDataAnalysisModelView.cs">
    139       <SubType>UserControl</SubType>
    140     </Compile>
     130    <Compile Include="GraphicalSymbolicDataAnalysisModelView.cs" />
    141131    <Compile Include="GraphicalSymbolicDataAnalysisModelView.designer.cs">
    142132      <DependentUpon>GraphicalSymbolicDataAnalysisModelView.cs</DependentUpon>
    143133    </Compile>
    144     <Compile Include="Symbols\ConstantView.cs">
    145       <SubType>UserControl</SubType>
    146     </Compile>
     134    <Compile Include="Symbols\ConstantView.cs" />
    147135    <Compile Include="Symbols\ConstantView.Designer.cs">
    148136      <DependentUpon>ConstantView.cs</DependentUpon>
    149137    </Compile>
    150     <Compile Include="Symbols\LaggedVariableView.cs">
    151       <SubType>UserControl</SubType>
    152     </Compile>
     138    <Compile Include="Symbols\LaggedVariableView.cs" />
    153139    <Compile Include="Symbols\LaggedVariableView.Designer.cs">
    154140      <DependentUpon>LaggedVariableView.cs</DependentUpon>
    155141    </Compile>
    156     <Compile Include="Symbols\TimeLagView.cs">
    157       <SubType>UserControl</SubType>
    158     </Compile>
     142    <Compile Include="Symbols\TimeLagView.cs" />
    159143    <Compile Include="Symbols\TimeLagView.Designer.cs">
    160144      <DependentUpon>TimeLagView.cs</DependentUpon>
    161145    </Compile>
    162     <Compile Include="Symbols\VariableConditionView.cs">
    163       <SubType>UserControl</SubType>
    164     </Compile>
     146    <Compile Include="Symbols\VariableConditionView.cs" />
    165147    <Compile Include="Symbols\VariableConditionView.Designer.cs">
    166148      <DependentUpon>VariableConditionView.cs</DependentUpon>
    167149    </Compile>
    168     <Compile Include="Symbols\VariableView.cs">
    169       <SubType>UserControl</SubType>
    170     </Compile>
     150    <Compile Include="Symbols\VariableView.cs" />
    171151    <Compile Include="Symbols\VariableView.Designer.cs">
    172152      <DependentUpon>VariableView.cs</DependentUpon>
     
    193173    <None Include="Plugin.cs.frame" />
    194174    <None Include="Properties\AssemblyInfo.cs.frame" />
    195     <Compile Include="RunCollectionVariableImpactView.cs">
    196       <SubType>UserControl</SubType>
    197     </Compile>
     175    <Compile Include="RunCollectionVariableImpactView.cs" />
    198176    <Compile Include="RunCollectionVariableImpactView.Designer.cs">
    199177      <DependentUpon>RunCollectionVariableImpactView.cs</DependentUpon>
     
    205183      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    206184      <Name>HeuristicLab.Collections-3.3</Name>
     185      <Private>False</Private>
     186    </ProjectReference>
     187    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
     188      <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project>
     189      <Name>HeuristicLab.Common.Resources-3.3</Name>
    207190      <Private>False</Private>
    208191    </ProjectReference>
Note: See TracChangeset for help on using the changeset viewer.