Changeset 12038 for branches/ALPS

Timestamp:

02/19/15 10:14:22 (10 years ago)

Author:

pfleck

Message:

#2269 Merged r12037 from trunk into ALPS.

Location:

branches/ALPS

Files:

• . (modified) (1 prop)
• HeuristicLab.Data.Views/3.3 (modified) (1 prop)
• HeuristicLab.Data.Views/3.3/EnumValueView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Data.Views/3.3/EnumValueView.Designer.cs)
• HeuristicLab.Data.Views/3.3/EnumValueView.cs (copied) (copied from trunk/sources/HeuristicLab.Data.Views/3.3/EnumValueView.cs)
• HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Data/3.3 (modified) (1 prop)
• HeuristicLab.Data/3.3/EnumValue.cs (copied) (copied from trunk/sources/HeuristicLab.Data/3.3/EnumValue.cs)

branches/ALPS/HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj

@@ -133 +133 @@
       <DependentUpon>EnhancedStringConvertibleMatrixView.cs</DependentUpon>
     </Compile>
+    <Compile Include="EnumValueView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="EnumValueView.Designer.cs">
+      <DependentUpon>EnumValueView.cs</DependentUpon>
+    </Compile>
     <Compile Include="IntRangeView.cs">
       <SubType>UserControl</SubType>
@@ -213 +219 @@
     <Compile Include="StringConvertibleValueView.Designer.cs">
       <DependentUpon>StringConvertibleValueView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="EnumValueView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="EnumValueView.Designer.cs">
-      <DependentUpon>EnumValueView.cs</DependentUpon>
     </Compile>
   </ItemGroup>