Context Navigation

HeuristicLab.Problems.QuadraticAssignment.Algorithms

Timestamp:

03/28/12 15:47:26 (13 years ago)

Author:

spimming

Message:

#1680: merged changes from trunk into branch

Location:

branches/HeuristicLab.Hive.Azure

Files:

Property svn:ignore

-                      old
+                      new
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user

Property svn:mergeinfo changed

-                      r6866
+                      r7669
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
+      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
+      <Name>HeuristicLab.Problems.Instances-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Problems.QuadraticAssignment\3.3\HeuristicLab.Problems.QuadraticAssignment-3.3.csproj">
       <Project>{79271BC8-4446-40E2-BB89-9BE4E17174FE}</Project>

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