#
# ChangeLog for branches/OaaS/ConfigMerger.exe
#
# Generated by Trac 1.0.12
# 12/03/24 20:02:48

Thu, 05 Jul 2012 11:28:51 GMT spimming [8228]
	* branches/OaaS (copied)

	#1888: initial version for optimization as a service branch


Tue, 10 May 2011 10:24:33 GMT ascheibe [6173]
	* trunk/sources/ConfigMerger.exe (modified)
	* trunk/sources/HeuristicLab.Persistence/3.3/HeuristicLab.Persistence-3.3.csproj (modified)
	* trunk/sources/HeuristicLab.Tracing/3.3/HeuristicLab.Hive.log4net.xml (deleted)
	* trunk/sources/HeuristicLab.Tracing/3.3/HeuristicLab.Tracing-3.3.csproj (modified)
	* trunk/sources/HeuristicLab.Tracing/3.3/HeuristicLab.log4net.xml (deleted)
	* trunk/sources/HeuristicLab.Tracing/3.3/HeuristicLabTracingPlugin.cs.frame (modified)
	* trunk/sources/HeuristicLab.Tracing/3.3/HiveLogger.cs (deleted)
	* trunk/sources/HeuristicLab.Tracing/3.3/Logger.cs (modified)
	* trunk/sources/HeuristicLab.Tracing/3.3/Properties/Settings.Designer.cs (modified)
	* trunk/sources/HeuristicLab.Tracing/3.3/Properties/Settings.settings (modified)
	* trunk/sources/HeuristicLab.Tracing/3.3/app.config (modified)
	* trunk/tools/ConfigMerger/ConfigMerger.cs (modified)

	#1517
	- rewrote Logger to use Diagnostics.Trace
	- removed ...