Context Navigation

HeuristicLab

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

-                      r6866
+                      r7085
     <None Include="app.config">
       <SubType>Designer</SubType>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="CustomPostBuild.cmd" />
     <None Include="CustomPostBuildTemplate_UpdateLocalInstallation.cmd" />
     <None Include="HeuristicLab.snk" />
-    <None Include="MergeConfigs.cmd" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
     <None Include="Properties\Settings.settings">
 …
 set Configuration=$(ConfigurationName)
 call MergeConfigs.cmd
+call "$(SolutionDir)MergeConfigs.cmd"
 if exist "%25ProjectDir%25CustomPostBuild.cmd" call CustomPostBuild.cmd</PostBuildEvent>
   </PropertyGroup>

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