Context Navigation

HeuristicLab.Operators.Programmable.Views-3.3.csproj

Timestamp:

02/10/15 09:57:29 (10 years ago)

Author:

pfleck

Message:

#2269 merged trunk

Location:

branches/ALPS

Files:

Property svn:mergeinfo changed

/branches/CodeEditor (added)	merged: 11700-11701,11707,11722,11738,11741,11743,11765,11785,11800,11802,11804-11805
/trunk/sources	merged: 11679-11680,11703-11705,11715,11717,11721,11723-11725,11734-11736,11756-11758,11762-11763,11766,11771-11772,11781-11782,11784,11787-11790,11794,11807,11809-11811,11815-11816,11818-11819,11822,11825-11831,11833-11837,11839-11840,11854,11856,11877-11879,11882,11890,11909,11912-11916,11918,11921,11930,11933-11934,11936,11938-11939,11942,11945,11948,11950-11951,11955-11956,11958-11961,11963,11967,11970-11971

-                      r11677
+                      r11975
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\HeuristicLab.CodeEditor\3.3\HeuristicLab.CodeEditor-3.3.csproj">
       <Project>{489CFE09-FDF7-4C89-BAB5-BD09CADD61AD}</Project>
       <Name>HeuristicLab.CodeEditor-3.3</Name>
+    <ProjectReference Include="..\..\HeuristicLab.CodeEditor\3.4\HeuristicLab.CodeEditor-3.4.csproj">
+      <Project>{C38691AE-ECB4-489A-A05D-B035554E0168}</Project>
+      <Name>HeuristicLab.CodeEditor-3.4</Name>
       <Private>False</Private>
     </ProjectReference>

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