Context Navigation

HeuristicLab.Data-3.3.csproj

Timestamp:

06/25/19 23:14:06 (5 years ago)

Author:

mkommend

Message:

#2435: Updated branch with most recent trunk changes.

Location:

branches/2435-alglib_3_15

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 (added)	merged: 16700-16704,16706-16707,16716,16729,16737,16740,16743,16757-16758,16762-16764,16768-16769,16779,16782-16784,16788,16792,16794-16799,16802,16819-16822,16839,16853,16855-16856,16858,16860-16861,16867-16869,16872-16873,16875,16878,16890,16894,16905-16910,16933,16939-16940,16942,16944-16945,16978-16983,16992,16997,17007-17009,17014-17016,17019-17024,17028,17030,17032-17033

-                      r16658
+                      r17034
     <Compile Include="ComparisonType.cs" />
     <Compile Include="EnumValue.cs" />
+    <Compile Include="Interfaces\ITextValue.cs" />
     <Compile Include="Interfaces\IValueTypeArray.cs" />
     <Compile Include="Path Types\DirectoryValue.cs" />
 …
     <Compile Include="StringConvertibleArray.cs" />
     <Compile Include="StringMatrix.cs" />
+    <Compile Include="TextValue.cs" />
     <Compile Include="StringValue.cs" />
     <Compile Include="TimeSpanValue.cs" />

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

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

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