Context Navigation

Changeset 17117 for stable/HeuristicLab.Data.Views

Timestamp:

07/08/19 15:52:20 (5 years ago)

Author:

abeham

Message:

#2931: merged to stable (16910, 16939, 16944, 17095)

Location:

stable

Files:

Property svn:mergeinfo changed

/branches/2931_OR-Tools_LP_MIP (added)	merged: 16070,16138,16172,16233-16234,16288,16373,16405,16417,16419,16582,16717-16719,16721,16736,16745-16746,16748,16804-16805,16889,16891,16897
/trunk	merged: 16910,16939,16944,17095

stable/HeuristicLab.Data.Views
- Property svn:mergeinfo changed
  /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data.Views (added) merged: 16373,16405,16718
  /trunk/HeuristicLab.Data.Views merged: 16910
stable/HeuristicLab.Data.Views/3.3
- Property svn:mergeinfo changed
  /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data.Views/3.3 (added) merged: 16373,16405,16718
  /trunk/HeuristicLab.Data.Views/3.3 merged: 16910

-                      r17097
+                      r17117
       <DependentUpon>StringConvertibleMatrixView.cs</DependentUpon>
     </Compile>
+    <Compile Include="TextValueView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="TextValueView.Designer.cs">
+      <DependentUpon>TextValueView.cs</DependentUpon>
+    </Compile>
     <Compile Include="StringConvertibleValueView.cs">
       <SubType>UserControl</SubType>

Note: See TracChangeset for help on using the changeset viewer.

/branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data.Views (added)	merged: 16373,16405,16718
/trunk/HeuristicLab.Data.Views	merged: 16910

/branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data.Views/3.3 (added)	merged: 16373,16405,16718
/trunk/HeuristicLab.Data.Views/3.3	merged: 16910