Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/19/15 21:16:55 (9 years ago)
Author:
gkronber
Message:

#2069: merged r13210,r13225,r13266,r13309,r13311 from trunk to stable

Location:
stable
Files:
3 edited
1 copied

Legend:

Unmodified
Added
Removed

  • stable

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

    r12911 r13312  
    133133    <Compile Include="Plugin.cs" />
    134134    <Compile Include="Properties\AssemblyInfo.cs" />
     135    <Compile Include="Robocode\BattleRunnerDialog.cs">
     136      <SubType>Form</SubType>
     137    </Compile>
     138    <Compile Include="Robocode\BattleRunnerDialog.Designer.cs">
     139      <DependentUpon>BattleRunnerDialog.cs</DependentUpon>
     140    </Compile>
     141    <Compile Include="Robocode\CodeSymbolView.cs">
     142      <SubType>UserControl</SubType>
     143    </Compile>
     144    <Compile Include="Robocode\CodeSymbolView.Designer.cs">
     145      <DependentUpon>CodeSymbolView.cs</DependentUpon>
     146    </Compile>
     147    <Compile Include="Robocode\EnemyCollectionView.cs">
     148      <SubType>UserControl</SubType>
     149    </Compile>
     150    <Compile Include="Robocode\EnemyCollectionView.Designer.cs">
     151      <DependentUpon>EnemyCollectionView.cs</DependentUpon>
     152    </Compile>
     153    <Compile Include="Robocode\SolutionCodeView.cs">
     154      <SubType>UserControl</SubType>
     155    </Compile>
     156    <Compile Include="Robocode\SolutionCodeView.Designer.cs">
     157      <DependentUpon>SolutionCodeView.cs</DependentUpon>
     158    </Compile>
     159    <Compile Include="Robocode\SolutionProgramView.cs">
     160      <SubType>UserControl</SubType>
     161    </Compile>
     162    <Compile Include="Robocode\SolutionProgramView.Designer.cs">
     163      <DependentUpon>SolutionProgramView.cs</DependentUpon>
     164    </Compile>
    135165  </ItemGroup>
    136166  <ItemGroup>
    … …  
    140170  </ItemGroup>
    141171  <ItemGroup>
     172    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     173      <Project>{958b43bc-cc5c-4fa2-8628-2b3b01d890b6}</Project>
     174      <Name>HeuristicLab.Collections-3.3</Name>
     175      <Private>False</Private>
     176    </ProjectReference>
     177    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
     178      <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project>
     179      <Name>HeuristicLab.Common.Resources-3.3</Name>
     180      <Private>False</Private>
     181    </ProjectReference>
    142182    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    143183      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>

  • stable/HeuristicLab.Problems.GeneticProgramming.Views/3.3/Plugin.cs.frame

    r13279 r13312  
    2828  [Plugin("HeuristicLab.Problems.GeneticProgramming.Views","Provides views for for genetic programming problems such as the artificial ant problem.", "3.3.0.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.GeneticProgramming.Views-3.3.dll", PluginFileType.Assembly)]
     30  [PluginDependency("HeuristicLab.Common","3.3")]
     31  [PluginDependency("HeuristicLab.Common.Resources","3.3")]
     32  [PluginDependency("HeuristicLab.Collections","3.3")]
    3033  [PluginDependency("HeuristicLab.Core","3.3")]
    3134  [PluginDependency("HeuristicLab.Core.Views","3.3")]
Note: See TracChangeset for help on using the changeset viewer.