#
# ChangeLog for branches/HeuristicLab.Hive-3.4/sources/MergeConfigs.cmd
#
# Generated by Trac 1.0.12
# 11/27/24 19:39:04

Mon, 10 Oct 2011 12:06:54 GMT ascheibe [6896]
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab 3.3.exe.config (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator/3.3/HeuristicLab.Clients.Hive.Administrator-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.JobManager/3.3/HeuristicLab.Clients.Hive.JobManager-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/HeuristicLab.Clients.Hive.Slave.App-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon/3.3/HeuristicLab.Clients.Hive.Slave.TrayIcon-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/HeuristicLab.Clients.Hive.Slave.Views-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/HeuristicLab.Clients.Hive.Slave-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Tests/HeuristicLab.Clients.Hive.Tests-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/HeuristicLab.Clients.Hive.Views-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive 3.3.dll.config (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive 3.4.sln (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive/3.3/HeuristicLab.Hive-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine.Views/3.3/HeuristicLab.HiveEngine.Views-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.3/HeuristicLab.HiveEngine-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.3/Tests/HeuristicLab.HiveEngine.ConsoleTests-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HeuristicLab.Services.Hive.DataAccess-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/HeuristicLab.Services.Hive.Tests-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Web/Hive-3.3 (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HowToCompile.txt (modified)
	* branches/HeuristicLab.Hive-3.4/sources/MergeConfigs.cmd (modified)

	#1233 adapted relative assembly references and output paths to ...


Wed, 05 Oct 2011 15:21:16 GMT ascheibe [6872]
	* branches/HeuristicLab.Hive-3.4/sources/CopyAssembly.cmd (deleted)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab 3.3.exe.config (deleted)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator/3.3 (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator/3.3/HeuristicLab.Clients.Hive.Administrator-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Plugin.cs.frame (moved)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.JobManager/3.3 (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.JobManager/3.3/HeuristicLab.Clients.Hive.JobManager-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Plugin.cs.frame (moved)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3 (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/HeuristicLab.Clients.Hive.Slave.App-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/Plugin.cs.frame (moved)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon/3.3/HeuristicLab.Clients.Hive.Slave.TrayIcon-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3 (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/HeuristicLab.Clients.Hive.Slave.Views-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/Plugin.cs.frame (moved)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3 (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/HeuristicLab.Clients.Hive.Slave-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Plugin.cs.frame (moved)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Tests/HeuristicLab.Clients.Hive.Tests-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3 (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/HeuristicLab.Clients.Hive.Views-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/Plugin.cs.frame (moved)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3 (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/ExperimentManagerOnly.config (deleted)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/Plugin.cs.frame (moved)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive 3.4.sln (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive/3.3 (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive/3.3/HeuristicLab.Hive-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive/3.3/Plugin.cs.frame (moved)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine.Views/3.3 (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine.Views/3.3/HeuristicLab.HiveEngine.Views-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine.Views/3.3/Plugin.cs.frame (moved)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.3 (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.3/HeuristicLab.HiveEngine-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.3/Plugin.cs.frame (moved)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.3/Tests/HeuristicLab.HiveEngine.ConsoleTests-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3 (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HeuristicLab.Services.Hive.DataAccess-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Plugin.cs.frame (moved)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/HeuristicLab.Services.Hive.Tests-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3 (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/Plugin.cs.frame (moved)
	* branches/HeuristicLab.Hive-3.4/sources/HowToCompile.txt (added)
	* branches/HeuristicLab.Hive-3.4/sources/MergeConfigs.cmd (modified)

	#1233
	- updated project settings to work with the trunk ...


Fri, 09 Sep 2011 18:19:43 GMT ascheibe [6730]
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/HeuristicLab.Clients.Hive.Slave.App-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/HiveSlaveApplication.cs (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/MainWindow.Designer.cs (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/MainWindow.cs (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/MainWindow.resx (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon/3.3/MainWindow.Designer.cs (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon/3.3/MainWindow.cs (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon/3.3/MainWindow.resx (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/HeuristicLab.Clients.Hive.Slave.Views-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsBase.Designer.cs (copied)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsBase.cs (copied)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsBase.resx (copied)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsWithKill.Designer.cs (copied)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsWithKill.cs (copied)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsWithKill.resx (copied)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainView.Designer.cs (copied)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainView.cs (copied)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainView.resx (copied)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainViewBase.Designer.cs (copied)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainViewBase.cs (copied)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainViewBase.resx (copied)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainViewTray.Designer.cs (copied)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainViewTray.cs (copied)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainViewTray.resx (copied)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveStats.Designer.cs (copied)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveStats.cs (copied)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveStats.resx (copied)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveView.Designer.cs (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveView.cs (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveView.resx (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveViewTray.Designer.cs (copied)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveViewTray.cs (copied)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveViewTray.resx (copied)
	* branches/HeuristicLab.Hive-3.4/sources/MergeConfigs.cmd (modified)

	#1233 added Hive Slave HL App client


Fri, 02 Sep 2011 15:01:58 GMT ascheibe [6703]
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator/3.4 (deleted)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.4 (deleted)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3 (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/HeuristicLab.Clients.Hive.Slave.App-3.3.csproj (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/HeuristicLab.snk (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/HiveSlaveApplication.cs (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/Properties (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/Properties/AssemblyInfo.cs.frame (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/Properties/Resources.Designer.cs (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/Properties/Resources.resx (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/Properties/Settings.Designer.cs (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/Properties/Settings.settings (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.SlaveWindowsService/HeuristicLab.Clients.Hive.Slave.WindowsService-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.SlaveWindowsService/Properties/AssemblyInfo.cs (deleted)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.SlaveWindowsService/Properties/AssemblyInfo.cs.frame (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.SlaveWindowsServiceSetup/HeuristicLab.Clients.Hive.Slave.SlaveWindowsServiceSetup.vdproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon/3.3/HeuristicLab.Clients.Hive.Slave.TrayIcon-3.3.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon/3.3/Properties/AssemblyInfo.cs (deleted)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon/3.3/Properties/AssemblyInfo.cs.frame (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/Properties/AssemblyInfo.cs.frame (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4 (deleted)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Properties/AssemblyInfo.cs.frame (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4 (deleted)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/Properties/AssemblyInfo.cs.frame (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4 (deleted)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/Properties/AssemblyInfo.cs.frame (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4 (deleted)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive 3.3.dll.config (moved)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive 3.4.sln (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive/3.3/Properties/AssemblyInfo.cs.frame (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive/3.4 (deleted)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine.Views/3.4 (deleted)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.3/Properties/AssemblyInfo.cs.frame (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4 (deleted)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.3/Properties/AssemblyInfo.cs.frame (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4 (deleted)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Properties/AssemblyInfo.cs.frame (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4 (deleted)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/Properties/AssemblyInfo.cs.frame (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4 (deleted)
	* branches/HeuristicLab.Hive-3.4/sources/MergeConfigs.cmd (modified)

	#1233
	- really removed 3.4 folders
	- added skeleton for a Slave HL ...


Tue, 22 Mar 2011 10:36:53 GMT cneumuel [5786]
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Exceptions (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Exceptions/InvalidStateException.cs (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Exceptions/JobNotDataFoundException.cs (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Exceptions/JobNotFoundException.cs (added)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/HeuristicLab.Clients.Hive.Slave-3.4.csproj (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/InvalidStateException.cs (deleted)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveExperimentClient.cs (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveJobClient.cs (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveServiceClient.cs (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/LightweightJob.cs (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/ApplicationConstants.cs (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/DataTransfer/LightweightJob.cs (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/Convert.cs (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/HiveDao.cs (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/DaoTests.cs (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HeartbeatManager.cs (modified)
	* branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/LifecycleManager.cs (modified)
	* branches/HeuristicLab.Hive-3.4/sources/MergeConfigs.cmd (modified)

	#1233
	 * implemented correct numbering of `BatchRuns`
	 * ...


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