Changeset 12005 for stable/HeuristicLab.Optimization.Views

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:

• . (modified) (1 prop)
• HeuristicLab.Optimization.Views/3.3/CreateNewSingleEncodingDialog.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Views/3.3/CreateNewSingleEncodingDialog.Designer.cs)
• HeuristicLab.Optimization.Views/3.3/CreateNewSingleEncodingDialog.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Views/3.3/CreateNewSingleEncodingDialog.cs)
• HeuristicLab.Optimization.Views/3.3/CreateNewSingleEncodingDialog.resx (copied) (copied from trunk/sources/HeuristicLab.Optimization.Views/3.3/CreateNewSingleEncodingDialog.resx)
• HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Optimization.Views/3.3/MultiEncodingView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Views/3.3/MultiEncodingView.Designer.cs)
• HeuristicLab.Optimization.Views/3.3/MultiEncodingView.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Views/3.3/MultiEncodingView.cs)

stable/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

@@ -142 +142 @@
       <DependentUpon>BatchRunView.cs</DependentUpon>
     </Compile>
+    <Compile Include="CreateNewSingleEncodingDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="CreateNewSingleEncodingDialog.Designer.cs">
+      <DependentUpon>CreateNewSingleEncodingDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="ISingleObjectiveSolutionSimilarityCalculatorView.cs">
       <SubType>UserControl</SubType>
@@ -159 +165 @@
     <Compile Include="ISimilarityCalculatorView.Designer.cs">
       <DependentUpon>ISimilarityCalculatorView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="MultiEncodingView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="MultiEncodingView.Designer.cs">
+      <DependentUpon>MultiEncodingView.cs</DependentUpon>
     </Compile>
     <Compile Include="Plugin.cs" />
@@ -403 +415 @@
       <Private>False</Private>
     </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="CreateNewSingleEncodingDialog.resx">
+      <DependentUpon>CreateNewSingleEncodingDialog.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />