Context Navigation

Changeset 7085 for branches/RegressionBenchmarks/HeuristicLab.Persistence/3.3

Timestamp:

11/28/11 13:47:28 (13 years ago)

Author:

sforsten

Message:

#1669: branch has been merged with the trunk in revision 7081 and methods in RegressionBenchmark have been renamed.

Location:

branches/RegressionBenchmarks

Files:

Property svn:ignore

-                      old
+                      new
 *.suo
 *.vsp
+Doxygen
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user
 HeuristicLab.resharper.user
 ProtoGen.exe
 …
 bin
 protoc.exe
-HeuristicLab.ExtLibs.6.0.ReSharper.user
-Doxygen

Property svn:mergeinfo changed

/branches/Benchmarking/sources (added)	merged: 6920,6931-6932,6934,6948,6987,7000,7002,7004
/trunk/sources (added)	merged: 6961-6964,6974-6983,6986,6993-6995,6997-6999,7001,7006-7015,7017-7018,7020-7024,7027-7030,7032-7034,7037-7043,7045-7071,7073-7074,7076-7079

branches/RegressionBenchmarks/HeuristicLab.Persistence
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Persistence (added) merged: 7021

-                      r6866
+                      r7085
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\HeuristicLab.PluginInfrastructure\3.3\ICSharpCode.SharpZipLib.dll</HintPath>
+      <HintPath>..\..\bin\ICSharpCode.SharpZipLib.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />

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