#
# ChangeLog for stable/MergeConfigs.cmd
#
# Generated by Trac 1.0.12
# 11/01/24 07:52:47

Thu, 11 Jan 2018 02:39:49 GMT swagner [15593]
	* stable (modified)
	* stable/.editorconfig (copied)
	* stable/HeuristicLab 3.3.sln (modified)
	* stable/MergeConfigs.cmd (modified)

	#2640: Merged r15397 and r15398 into stable


Sat, 23 Jul 2016 22:22:11 GMT swagner [14211]
	* stable (modified)
	* stable/HeuristicLab.Clients.Hive.Slave/3.3/HeuristicLab.Clients.Hive.Slave-3.3.csproj (modified)
	* stable/HeuristicLab.Optimizer (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/ALPSGA_TSP.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/ALPSGP_SymReg.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/ES_Griewank.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/GA_BPP.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/GA_Grouping.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/GA_QAP_Script.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/GA_TSP.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/GA_VRP.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/GE_ArtificialAnt.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/GE_SymbReg.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/GPR.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/GP_Multiplexer.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/GUI_Automation_Script.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/GridSearch_RF_Classification_Script.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/GridSearch_RF_Regression_Script.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/GridSearch_SVM_Classification_Script.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/GridSearch_SVM_Regression_Script.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/IslandGA_TSP.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/LS_Knapsack.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/OSES_Griewank.hl (copied)
	* stable/HeuristicLab.Optimizer/3.3/Documents/OSGA_Rastrigin_Script.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/OSGP_TimeSeries.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/PSO_Schwefel.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/RAPGA_JSSP.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/SA_Rastrigin.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/SGP_Robocode.hl (copied)
	* stable/HeuristicLab.Optimizer/3.3/Documents/SGP_SantaFe.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/SGP_SymbClass.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/SGP_SymbReg.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/SS_VRP.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/TS_TSP.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/TS_VRP.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/VNS_OP.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/VNS_TSP.hl (modified)
	* stable/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj (modified)
	* stable/HeuristicLab.Optimizer/3.3/StartPage.cs (modified)
	* stable/HeuristicLab.Tests (modified)
	* stable/HeuristicLab.Tests/HeuristicLab-3.3/DeepCloneableCloningTest.cs (modified)
	* stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPRobocodeSampleTest.cs (modified)
	* stable/HeuristicLab/3.3/HeuristicLab-3.3.csproj (modified)
	* stable/MergeConfigs.cmd (modified)
	* stable/MergeConfigs.sh (modified)

	#2526: Merged r14203, r14204, r14206, r14207, r14209 into stable


Mon, 14 Dec 2015 09:27:02 GMT abeham [13453]
	* stable/HeuristicLab/3.3/CustomPostBuildTemplate_UpdateLocalInstallation.cmd (deleted)
	* stable/HeuristicLab/3.3/Files.txt (deleted)
	* stable/HeuristicLab/3.3/Files.x64.txt (deleted)
	* stable/HeuristicLab/3.3/Files.x86.txt (deleted)
	* stable/HeuristicLab/3.3/HeuristicLab-3.3.csproj (modified)
	* stable/MergeConfigs.cmd (modified)
	* stable/MergeConfigs.sh (modified)

	#2539: merged r13428:13430 to stable


Tue, 21 May 2013 14:23:48 GMT ascheibe [9503]
	* stable (copied)

	created stable branch


Thu, 09 May 2013 22:33:15 GMT swagner [9480]
	* tags/3.3.8 (copied)

	Created release tag for HeuristicLab 3.3.8 (#1889)