#
# ChangeLog for branches/HeuristicLab.Hive-3.4/sources/MergeConfigs.cmd
#
# Generated by Trac 1.0.12
# 11/10/24 08:33:43

Mon, 13 Dec 2010 15:09:22 GMT cneumuel [5095]
	* branches/HeuristicLab.Hive-3.4/sources (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/PluginClient.cs (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive 3.4.suo (deleted)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/HeuristicLab 3.3.exe.config (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/HeuristicLab.Services.Hive.Tests-3.4.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/Mocks/MockAuthorizationManager.cs (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/Mocks/MockLifecycleManager.cs (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/Mocks/MockServiceLocator.cs (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/ServerTest.cs (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Web (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HeuristicLab.Services.Hive-3.4.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/Hive.cs (deleted)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/Interfaces/ILifecycleManager.cs (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/Interfaces/IServiceLocator.cs (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/LifecycleManager.cs (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/ServiceLocator.cs (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/Standalone/HeuristicLabServicesHiveApplication.cs (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/app.config (modified)
	* branches/HeuristicLab.Hive-3.4/sources/MergeConfigs.cmd (modified)

	#1233
	 * fixed config merge process
	 * worked on hive server test setup


Tue, 07 Dec 2010 08:24:39 GMT cneumuel [5050]
	* branches/HeuristicLab.Hive-3.4/sources/ConfigMerger.exe (moved)
	* branches/HeuristicLab.Hive-3.4/sources/CopyAssembly.cmd (moved)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab 3.3.exe.config (moved)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive (moved)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave (moved)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views (moved)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views (moved)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive (moved)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive-3.3.dll.config (moved)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive.sln (moved)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive (moved)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common (moved)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess (moved)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Web (moved)
	* branches/HeuristicLab.Hive-3.4/sources/MergeConfigs.cmd (moved)
	* branches/HeuristicLab.Hive-3.4/sources/PreBuildEvent.cmd (moved)

	#1233 moved files to sources folder


Tue, 07 Dec 2010 08:19:45 GMT cneumuel [5046]
	* branches/HeuristicLab.Hive-3.4 (moved)

	#1233 changed branch name