Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/13/15 15:00:15 (9 years ago)
Author:
abeham
Message:

#2174, #2282: merged revisions r11961,r11963,r11967,r11970,r11971,r11982,r11984,r11998,r12001,r12002,r12003,r12004,r11939,r11945,r11956,r11958,r11959,r11960,r11983,r11987,r11988,r11990,r11993,r11994,r11996,r11999,r12000 to stable

Location:
stable
Files:
5 deleted
3 edited
1 copied

Legend:

Unmodified
Added
Removed

  • stable

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

    r11961 r12005  
    8787  </ItemGroup>
    8888  <ItemGroup>
    89     <Compile Include="MultiEncodingView.cs">
    90       <SubType>UserControl</SubType>
    91     </Compile>
    92     <Compile Include="MultiEncodingView.Designer.cs">
    93       <DependentUpon>MultiEncodingView.cs</DependentUpon>
    94     </Compile>
    95     <Compile Include="CreateNewSingleEncodingDialog.cs">
    96       <SubType>Form</SubType>
    97     </Compile>
    98     <Compile Include="CreateNewSingleEncodingDialog.Designer.cs">
    99       <DependentUpon>CreateNewSingleEncodingDialog.cs</DependentUpon>
    100     </Compile>
    10189    <Compile Include="Plugin.cs" />
    10290    <Compile Include="ProblemDefinitionScriptView.cs">
    … …  
    124112    <None Include="Plugin.cs.frame" />
    125113    <None Include="Properties\AssemblyInfo.cs.frame" />
    126   </ItemGroup>
    127   <ItemGroup>
    128     <EmbeddedResource Include="CreateNewSingleEncodingDialog.resx">
    129       <DependentUpon>CreateNewSingleEncodingDialog.cs</DependentUpon>
    130     </EmbeddedResource>
    131114  </ItemGroup>
    132115  <ItemGroup>

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

    r11961 r12005  
    2626  [PluginFile("HeuristicLab.Problems.Programmable.Views-3.3.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Common", "3.3")]
    28   [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
    2928  [PluginDependency("HeuristicLab.CodeEditor", "3.4")]
    3029  [PluginDependency("HeuristicLab.Core", "3.3")]
    … …  
    3231  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    3332  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
    34   [PluginDependency("HeuristicLab.Optimization", "3.3")]
    3533  [PluginDependency("HeuristicLab.Problems.Programmable", "3.3")]
    3634  [PluginDependency("HeuristicLab.Scripting", "3.3")]
Note: See TracChangeset for help on using the changeset viewer.