# # ChangeLog for trunk/tools/ConfigMerger/ConfigMerger.cs # # Generated by Trac 1.0.12 # 11/18/24 15:40:43 Thu, 22 Dec 2016 15:25:28 GMT sraggl [14524] * trunk/tools/ConfigMerger/ConfigMerger.cs (modified) Extended ConfigMerger to also merge ... 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 ... Wed, 22 Dec 2010 23:07:58 GMT swagner [5163] * trunk (modified) * trunk/sources (modified) * trunk/sources/ConfigMerger.exe (modified) * trunk/sources/HeuristicLab 3.3 Services.sln (modified) * trunk/sources/HeuristicLab 3.3 Services.vsmdi (modified) * trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.3/HeuristicLab.Algorithms.DataAnalysis.Views-3.3.csproj (modified) * trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.3/HeuristicLab.Algorithms.DataAnalysis-3.3.csproj (modified) * trunk/sources/HeuristicLab.Algorithms.EvolutionStrategy/3.3/HeuristicLab.Algorithms.EvolutionStrategy-3.3.csproj (modified) * trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/HeuristicLab.Algorithms.GeneticAlgorithm-3.3.csproj (modified) * trunk/sources/HeuristicLab.Algorithms.LocalSearch/3.3/HeuristicLab.Algorithms.LocalSearch-3.3.csproj (modified) * trunk/sources/HeuristicLab.Algorithms.NSGA2/3.3/HeuristicLab.Algorithms.NSGA2-3.3.csproj (modified) * trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.csproj (modified) * trunk/sources/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/HeuristicLab.Algorithms.SimulatedAnnealing-3.3.csproj (modified) * trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/HeuristicLab.Algorithms.TabuSearch-3.3.csproj (modified) * trunk/sources/HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj (modified) * trunk/sources/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj (modified) * trunk/sources/HeuristicLab.Clients.Common/3.3/HeuristicLab.Clients.Common-3.3.csproj (modified) * trunk/sources/HeuristicLab.CodeEditor/3.3/HeuristicLab.CodeEditor-3.3.csproj (modified) * trunk/sources/HeuristicLab.Collections/3.3/HeuristicLab.Collections-3.3.csproj (modified) * trunk/sources/HeuristicLab.Common.Resources/3.3/HeuristicLab.Common.Resources-3.3.csproj (modified) * trunk/sources/HeuristicLab.Common/3.3/HeuristicLab.Common-3.3.csproj (modified) * trunk/sources/HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj (modified) * trunk/sources/HeuristicLab.Core.Views/3.3/Properties/AssemblyInfo.frame (modified) * trunk/sources/HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj (modified) * trunk/sources/HeuristicLab.Core/3.3/Properties/AssemblyInfo.frame (modified) * trunk/sources/HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj (modified) * trunk/sources/HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj (modified) * trunk/sources/HeuristicLab.DebugEngine/3.3/HeuristicLab.DebugEngine-3.3.csproj (modified) * trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/HeuristicLab.Encodings.BinaryVectorEncoding-3.3.csproj (modified) * trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Tests/HeuristicLab.Encodings.BinaryVectorEncoding-3.3.Tests.csproj (modified) * trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Tests/Test References/HeuristicLab.Encodings.BinaryVectorEncoding-3.3.accessor (copied) * trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Tests/Test References/HeuristicLab.Encodings.BinaryVectors-3.3.accessor (deleted) * trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/HeuristicLab.Encodings.IntegerVectorEncoding-3.3.csproj (modified) * trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Tests/HeuristicLab.Encodings.IntegerVectorEncoding-3.3.Tests.csproj (modified) * trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Tests/Test References/HeuristicLab.Encodings.IntVector-3.3.accessor (deleted) * trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Tests/Test References/HeuristicLab.Encodings.IntegerVectorEncoding-3.3.accessor (copied) * trunk/sources/HeuristicLab.Encodings.PermutationEncoding.Views/3.3/HeuristicLab.Encodings.PermutationEncoding.Views-3.3.csproj (modified) * trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/HeuristicLab.Encodings.PermutationEncoding-3.3.csproj (modified) * trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Tests/HeuristicLab.Encodings.PermutationEncoding-3.3.Tests.csproj (modified) * trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Tests/Test References/HeuristicLab.Encodings.Permutation-3.3.accessor (deleted) * trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Tests/Test References/HeuristicLab.Encodings.PermutationEncoding-3.3.accessor (copied) * trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj (modified) * trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Tests/HeuristicLab.Encodings.RealVectorEncoding-3.3.Tests.csproj (modified) * trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Tests/Test References/HeuristicLab.Encodings.RealVector-3.3.accessor (deleted) * trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Tests/Test References/HeuristicLab.Encodings.RealVectorEncoding-3.3.accessor (copied) * trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3.csproj (modified) * trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/2.5.0/ALGLIB-2.5.0/ALGLIB-2.5.0.csproj (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/2.5.0/HeuristicLab.ALGLIB-2.5.0/HeuristicLab.ALGLIB-2.5.0.csproj (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.1.0/ALGLIB-3.1.0/ALGLIB-3.1.0.csproj (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.1.0/HeuristicLab.ALGLIB-3.1.0/HeuristicLab.ALGLIB-3.1.0.csproj (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.LibSVM/1.6.3/HeuristicLab.LibSVM-1.6.3/HeuristicLab.LibSVM-1.6.3.csproj (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.LibSVM/1.6.3/LibSVM-1.6.3/LibSVM-1.6.3.csproj (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446.csproj (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446.csproj (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Resources/Resource1.Designer.cs (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/HeuristicLab.ProtobufCS/HeuristicLab.ProtobufCS-0.9.1.csproj (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/AddressBook/AddressBook.csproj (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtoBench/ProtoBench.csproj (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtoDump/ProtoDump.csproj (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtoGen.Test/ProtoGen.Test.csproj (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtoGen/ProtoGen.csproj (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtoMunge/ProtoMunge.csproj (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtocolBuffers/ProtocolBuffers.csproj (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtocolBuffers/ProtocolBuffersCF.csproj (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SharpDevelop/3.1.1.5327/HeuristicLab.SharpDevelop-3.1.1.5327.csproj (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.WinFormsUI/2.3.1/HeuristicLab.WinFormsUI-2.3.1/HeuristicLab.WinFormsUI-2.3.1.csproj (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.WinFormsUI/2.3.1/WinFormsUI-2.3.1/Docking/Resources.Designer.cs (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.WinFormsUI/2.3.1/WinFormsUI-2.3.1/Docking/Strings.Designer.cs (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.WinFormsUI/2.3.1/WinFormsUI-2.3.1/WinFormsUI-2.3.1.csproj (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.log4net/1.2.10.0/HeuristicLab.log4net-1.2.10.0.csproj (modified) * trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/HeuristicLab.MainForm.WindowsForms-3.3.csproj (modified) * trunk/sources/HeuristicLab.MainForm/3.3/HeuristicLab.MainForm-3.3.csproj (modified) * trunk/sources/HeuristicLab.Operators.Programmable/3.3/HeuristicLab.Operators.Programmable-3.3.csproj (modified) * trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/HeuristicLab.Operators.Views.GraphVisualization-3.3.csproj (modified) * trunk/sources/HeuristicLab.Operators.Views/3.3/HeuristicLab.Operators.Views-3.3.csproj (modified) * trunk/sources/HeuristicLab.Operators/3.3/HeuristicLab.Operators-3.3.csproj (modified) * trunk/sources/HeuristicLab.Optimization.Operators/3.3/HeuristicLab.Optimization.Operators-3.3.csproj (modified) * trunk/sources/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj (modified) * trunk/sources/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (modified) * trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj (modified) * trunk/sources/HeuristicLab.Parameters.Views/3.3/HeuristicLab.Parameters.Views-3.3.csproj (modified) * trunk/sources/HeuristicLab.Parameters/3.3/HeuristicLab.Parameters-3.3.csproj (modified) * trunk/sources/HeuristicLab.Persistence.GUI/3.3/HeuristicLab.Persistence.GUI-3.3.csproj (modified) * trunk/sources/HeuristicLab.Persistence/3.3/HeuristicLab.Persistence-3.3.csproj (modified) * trunk/sources/HeuristicLab.Persistence/3.3/app.config (modified) * trunk/sources/HeuristicLab.PluginInfrastructure/3.3/HeuristicLab.PluginInfrastructure-3.3.csproj (modified) * trunk/sources/HeuristicLab.Problems.ArtificialAnt.Views/3.3/HeuristicLab.Problems.ArtificialAnt.Views-3.3.csproj (modified) * trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.3/HeuristicLab.Problems.ArtificialAnt-3.3.csproj (modified) * trunk/sources/HeuristicLab.Problems.DataAnalysis (modified) * trunk/sources/HeuristicLab.Problems.DataAnalysis.Classification.Views/3.3/HeuristicLab.Problems.DataAnalysis.Classification.Views-3.3.csproj (modified) * trunk/sources/HeuristicLab.Problems.DataAnalysis.Classification/3.3/HeuristicLab.Problems.DataAnalysis.Classification-3.3.csproj (modified) * trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj (modified) * trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/HeuristicLab.Problems.DataAnalysis.Views-3.3.csproj (modified) * trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/HeuristicLab.Problems.DataAnalysis-3.3.csproj (modified) * trunk/sources/HeuristicLab.Problems.ExternalEvaluation.GP.Views/3.3/HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3.csproj (modified) * trunk/sources/HeuristicLab.Problems.ExternalEvaluation.GP/3.3/HeuristicLab.Problems.ExternalEvaluation.GP-3.3.csproj (modified) * trunk/sources/HeuristicLab.Problems.ExternalEvaluation.Views/3.3/HeuristicLab.Problems.ExternalEvaluation.Views-3.3.csproj (modified) * trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/HeuristicLab.Problems.ExternalEvaluation-3.3.csproj (modified) * trunk/sources/HeuristicLab.Problems.Knapsack.Views/3.3/HeuristicLab.Problems.Knapsack.Views-3.3.csproj (modified) * trunk/sources/HeuristicLab.Problems.Knapsack/3.3/HeuristicLab.Problems.Knapsack-3.3.csproj (modified) * trunk/sources/HeuristicLab.Problems.OneMax.Views/3.3/HeuristicLab.Problems.OneMax.Views-3.3.csproj (modified) * trunk/sources/HeuristicLab.Problems.OneMax/3.3/HeuristicLab.Problems.OneMax-3.3.csproj (modified) * trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/HeuristicLab.Problems.TestFunctions.Views-3.3.csproj (modified) * trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj (modified) * trunk/sources/HeuristicLab.Problems.TravelingSalesman.Views/3.3/HeuristicLab.Problems.TravelingSalesman.Views-3.3.csproj (modified) * trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/HeuristicLab.Problems.TravelingSalesman-3.3.csproj (modified) * trunk/sources/HeuristicLab.Problems.VehicleRouting (modified) * trunk/sources/HeuristicLab.Problems.VehicleRouting.Views (modified) * trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.3/HeuristicLab.Problems.VehicleRouting.Views-3.3.csproj (modified) * trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/HeuristicLab.Problems.VehicleRouting-3.3.csproj (modified) * trunk/sources/HeuristicLab.Random/3.3/HeuristicLab.Random-3.3.csproj (modified) * trunk/sources/HeuristicLab.Selection/3.3/HeuristicLab.Selection-3.3.csproj (modified) * trunk/sources/HeuristicLab.SequentialEngine/3.3/HeuristicLab.SequentialEngine-3.3.csproj (modified) * trunk/sources/HeuristicLab.Services.Deployment.DataAccess/3.3/HeuristicLab.Services.Deployment.DataAccess-3.3.csproj (modified) * trunk/sources/HeuristicLab.Services.Deployment/3.3/HeuristicLab.Services.Deployment-3.3.csproj (modified) * trunk/sources/HeuristicLab.Tracing/3.3/HeuristicLab.Tracing-3.3.csproj (modified) * trunk/sources/HeuristicLab.Tracing/3.3/app.config (modified) * trunk/sources/HeuristicLab.Visualization.ChartControlsExtensions/3.3/HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj (modified) * trunk/sources/HeuristicLab/3.3/HeuristicLab-3.3.csproj (modified) * trunk/sources/HeuristicLab/3.3/Properties/Resources.Designer.cs (modified) * trunk/sources/HeuristicLab/3.3/app.config (modified) * trunk/tools/ConfigMerger/ConfigMerger.cs (modified) * trunk/tools/ConfigMerger/ConfigMerger.csproj (modified) * trunk/tools/ConfigMerger/app.config (copied) Reintegrated .NET 4.0 migration branch (#1350) Tue, 18 May 2010 02:08:57 GMT swagner [3836] * trunk/tools/ConfigMerger/ConfigMerger.cs (modified) Added additional trace messages to !ConfigMerger (#1017) Wed, 07 Apr 2010 20:48:46 GMT abeham [3284] * trunk/tools/ConfigMerger/ConfigMerger.cs (modified) updated `ConfigMerger` by merging behaviors separately #962 Fri, 29 Jan 2010 18:16:32 GMT abeham [2725] * trunk/sources/ConfigMerger.exe (modified) * trunk/tools/ConfigMerger/ConfigMerger.cs (modified) Fixed a bug in ConfigMerger when the bindings root node didn't exist ... Thu, 28 Jan 2010 15:21:10 GMT abeham [2697] * trunk/tools/ConfigMerger/ConfigMerger.cs (modified) Changed ConfigMerger to merge each possible binding in ... Wed, 27 Jan 2010 16:34:07 GMT gkronber [2692] * trunk/sources/ConfigMerger.exe (modified) * trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SQLServerCompact/3.5.1.0/HeuristicLab.SQLServerCompact-3.5.1.0.csproj (modified) * trunk/sources/HeuristicLab.Modeling.Database.SQLServerCompact/3.2/HeuristicLabModelingDatabaseSQLServerCompactPlugin.cs (modified) * trunk/sources/HeuristicLab/MergeConfigs.cmd (modified) * trunk/sources/HeuristicLab/app.config (modified) * trunk/tools/ConfigMerger/ConfigMerger.cs (modified) Fixed #855 (Configuration for SQL Compact DbProviderFactory should be ... Tue, 05 Jan 2010 16:26:13 GMT swagner [2602] * trunk/sources/ConfigMerger.exe (modified) * trunk/tools/ConfigMerger/ConfigMerger.cs (modified) Improved error messages of ConfigMerger (#827) Thu, 15 Jan 2009 14:57:44 GMT gkronber [1142] * trunk/sources/ConfigMerger.exe (modified) * trunk/tools/ConfigMerger/ConfigMerger.cs (modified) updated configMerger to merge connectionStrings (#469) Wed, 10 Dec 2008 14:31:28 GMT kgrading [951] * trunk/sources/ConfigMerger.exe (modified) * trunk/tools/ConfigMerger/ConfigMerger.cs (modified) quickfix for #429 (extended the configMerger) Wed, 10 Dec 2008 13:42:39 GMT gkronber [943] * trunk/sources/ConfigMerger.exe (modified) * trunk/tools/ConfigMerger/ConfigMerger.cs (modified) quick fix for #428 (ConfigMerger doesn't merge system.serviceModel ... Sat, 29 Nov 2008 23:40:01 GMT swagner [875] * trunk/tools/ConfigMerger/ConfigMerger.cs (modified) Enhanced ConfigMerger to prevent multiple merges of application and ... Fri, 28 Nov 2008 01:30:13 GMT swagner [849] * trunk/tools/ConfigMerger/ConfigMerger.cs (moved) * trunk/tools/ConfigMerger/ConfigMerger.csproj (modified) Implemented first functional prototype of ConfigMerger (#402) Fri, 28 Nov 2008 00:06:17 GMT swagner [848] * trunk/tools (added) * trunk/tools/ConfigMerger (added) * trunk/tools/ConfigMerger/ConfigMerger.csproj (added) * trunk/tools/ConfigMerger/HeuristicLab.snk (added) * trunk/tools/ConfigMerger/Program.cs (added) * trunk/tools/ConfigMerger/Properties (added) * trunk/tools/ConfigMerger/Properties/AssemblyInfo.frame (added) * trunk/tools/PreBuildEvent.cmd (added) * trunk/tools/Tools.sln (added) Added new solution for HeuristicLab build tools and empty console ...