Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/03/12 11:22:21 (12 years ago)
Author:
gkronber
Message:

#1081: merged r7214:7266 from trunk into time series branch.

Location:
branches/HeuristicLab.TimeSeries
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.TimeSeries

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive.Views/3.3

    • Property svn:ignore
      •  

        old new  
        11obj
        22Plugin.cs
         3*.vs10x
  • branches/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive.Views/3.3/HeuristicLab.Clients.Hive.Views-3.3.csproj

    r6977 r7268  
    9595  </ItemGroup>
    9696  <ItemGroup>
     97    <Compile Include="HiveInformationDialog.cs">
     98      <SubType>Form</SubType>
     99    </Compile>
     100    <Compile Include="HiveInformationDialog.Designer.cs">
     101      <DependentUpon>HiveInformationDialog.cs</DependentUpon>
     102    </Compile>
    97103    <Compile Include="HiveTasks\OptimizerHiveTaskView.cs">
    98104      <SubType>UserControl</SubType>
     
    163169      <DependentUpon>StateLogView.cs</DependentUpon>
    164170    </Compile>
    165     <Compile Include="HiveImageLibrary.Designer.cs">
    166       <AutoGen>True</AutoGen>
    167       <DesignTime>True</DesignTime>
    168       <DependentUpon>HiveImageLibrary.resx</DependentUpon>
    169     </Compile>
    170171    <None Include="Plugin.cs.frame" />
    171172    <Compile Include="Plugin.cs" />
     
    183184  </ItemGroup>
    184185  <ItemGroup>
    185     <EmbeddedResource Include="HiveTasks\OptimizerHiveTaskView.resx">
    186       <DependentUpon>OptimizerHiveTaskView.cs</DependentUpon>
     186    <EmbeddedResource Include="HiveInformationDialog.resx">
     187      <DependentUpon>HiveInformationDialog.cs</DependentUpon>
    187188    </EmbeddedResource>
    188     <EmbeddedResource Include="HiveTasks\HiveTaskView.resx">
    189       <DependentUpon>HiveTaskView.cs</DependentUpon>
    190     </EmbeddedResource>
    191     <EmbeddedResource Include="TreeView\ItemTreeView.resx">
    192       <DependentUpon>ItemTreeView.cs</DependentUpon>
    193     </EmbeddedResource>
    194     <EmbeddedResource Include="StateLog\StateLogGanttChartListView.resx">
    195       <DependentUpon>StateLogGanttChartListView.cs</DependentUpon>
    196     </EmbeddedResource>
    197     <EmbeddedResource Include="GanttChart\GanttChart.resx">
    198       <DependentUpon>GanttChart.cs</DependentUpon>
    199     </EmbeddedResource>
    200     <EmbeddedResource Include="StateLog\StateLogGanttChartView.resx">
    201       <DependentUpon>StateLogGanttChartView.cs</DependentUpon>
    202     </EmbeddedResource>
    203     <EmbeddedResource Include="StateLog\StateLogView.resx">
    204       <DependentUpon>StateLogView.cs</DependentUpon>
    205     </EmbeddedResource>
    206     <EmbeddedResource Include="HiveImageLibrary.resx">
    207       <Generator>PublicResXFileCodeGenerator</Generator>
    208       <LastGenOutput>HiveImageLibrary.Designer.cs</LastGenOutput>
    209     </EmbeddedResource>
    210     <EmbeddedResource Include="Progress\ProgressView.resx">
    211       <DependentUpon>ProgressView.cs</DependentUpon>
    212     </EmbeddedResource>
    213   </ItemGroup>
    214   <ItemGroup>
    215     <None Include="Images\Monitor.ico" />
    216   </ItemGroup>
    217   <ItemGroup>
    218     <None Include="Images\network_center.ico" />
    219189  </ItemGroup>
    220190  <ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.