#
# ChangeLog for trunk/sources/MergeConfigs.cmd
#
# Generated by Trac 1.0.12
# 11/30/24 12:31:49

Wed, 04 Oct 2017 07:58:46 GMT abeham [15398]
	* trunk/sources/MergeConfigs.cmd (modified)

	#2640: fixed interactive merge config


Sat, 23 Jul 2016 21:05:15 GMT swagner [14207]
	* trunk/sources/HeuristicLab.Clients.Hive.Slave/3.3/HeuristicLab.Clients.Hive.Slave-3.3.csproj (modified)
	* trunk/sources/HeuristicLab/3.3/HeuristicLab-3.3.csproj (modified)
	* trunk/sources/MergeConfigs.cmd (modified)
	* trunk/sources/MergeConfigs.sh (modified)

	#2526: Corrected post build events and config merging


Wed, 02 Dec 2015 11:32:35 GMT abeham [13428]
	* trunk/sources/HeuristicLab/3.3/CustomPostBuildTemplate_UpdateLocalInstallation.cmd (deleted)
	* trunk/sources/HeuristicLab/3.3/Files.txt (deleted)
	* trunk/sources/HeuristicLab/3.3/Files.x64.txt (deleted)
	* trunk/sources/HeuristicLab/3.3/Files.x86.txt (deleted)
	* trunk/sources/HeuristicLab/3.3/HeuristicLab-3.3.csproj (modified)
	* trunk/sources/MergeConfigs.cmd (modified)
	* trunk/sources/MergeConfigs.sh (modified)

	#2539: fixed MergeConfigs.cmd and .sh files, removed obsolete files


Thu, 24 Nov 2011 10:34:22 GMT abeham [7060]
	* trunk/sources/HeuristicLab.Tracing/3.3/HeuristicLab.Tracing-3.3.csproj (modified)
	* trunk/sources/HeuristicLab/3.3/HeuristicLab-3.3.csproj (modified)
	* trunk/sources/HeuristicLab/3.3/MergeConfigs.cmd (deleted)
	* trunk/sources/MergeConfigs.cmd (added)

	#1653
	 * Changed config merging behavior to always merge from the ...