Changeset 16430
- Timestamp:
- 12/21/18 12:52:08 (3 years ago)
- Location:
- trunk
- Files:
-
- 1 deleted
- 236 edited
- 1 copied
-
trunk
- Property svn:mergeinfo changed
-
trunk/.editorconfig
- Property svn:mergeinfo changed
/stable/.editorconfig reverse-merged: 15587-15588 /trunk/.editorconfig (added) merged: 16117,16356,16389
- Property svn:mergeinfo changed
-
trunk/.nuget
- Property svn:mergeinfo deleted
-
trunk/Build.cmd
- Property svn:mergeinfo deleted
-
trunk/Clean.cmd
- Property svn:mergeinfo deleted
-
trunk/ConfigMerger.exe
- Property svn:mergeinfo deleted
-
trunk/FxCop.cmd
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab 3.3 Hive.Slave.sln
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab 3.3 Services.sln
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab 3.3 Services.vsmdi
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab 3.3 Tests.sln
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab 3.3.sln
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab 3.3.sln.DotSettings
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Algorithms.ALPS
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Algorithms.ALPS (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.Algorithms.ALPS merged: 15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Algorithms.Benchmarks
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Algorithms.Benchmarks.Views
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Algorithms.CMAEvolutionStrategy
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Algorithms.DataAnalysis
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Algorithms.DataAnalysis.Glmnet
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Algorithms.DataAnalysis.Views
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Algorithms.DataAnalysis.Views (added) merged: 15730,15738,15782,16117,16356,16389 /trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views (added) merged: 15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Algorithms.DataAnalysis/3.4
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Algorithms.EvolutionStrategy
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Algorithms.GeneticAlgorithm
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Algorithms.GradientDescent
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Algorithms.LocalSearch
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Algorithms.MOCMAEvolutionStrategy
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Algorithms.MOCMAEvolutionStrategy (added) merged: 16071,16117,16356,16389 /trunk/sources/HeuristicLab.Algorithms.MOCMAEvolutionStrategy merged: 15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Algorithms.NSGA2
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Algorithms.ParameterlessPopulationPyramid
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Algorithms.ParticleSwarmOptimization
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Algorithms.RAPGA
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Algorithms.RandomSearch
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Algorithms.ScatterSearch
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Algorithms.SimulatedAnnealing
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Algorithms.TabuSearch
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Algorithms.VariableNeighborhoodSearch
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Analysis
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Analysis (added) merged: 16117,16177,16356,16389 /trunk/sources/HeuristicLab.Analysis (added) merged: 15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Analysis.Statistics.Views
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Analysis.Views
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Analysis.Views (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.Analysis.Views (added) merged: 15581,15583,15589,15619
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Clients.Access
- Property svn:mergeinfo changed
/stable/HeuristicLab.Clients.Access reverse-merged: 15587 /trunk/HeuristicLab.Clients.Access (added) merged: 16117,16356,16389
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Clients.Access.Administration
- Property svn:mergeinfo changed
/stable/HeuristicLab.Clients.Access.Administration reverse-merged: 15587 /trunk/HeuristicLab.Clients.Access.Administration (added) merged: 16117,16356,16389
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Clients.Access.Views
- Property svn:mergeinfo changed
/stable/HeuristicLab.Clients.Access.Views reverse-merged: 15587 /trunk/HeuristicLab.Clients.Access.Views (added) merged: 16117,16186-16187,16356,16389
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Clients.Common
- Property svn:mergeinfo changed
/stable/HeuristicLab.Clients.Common reverse-merged: 15587 /trunk/HeuristicLab.Clients.Common (added) merged: 16117,16356,16389
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Clients.Hive
- Property svn:mergeinfo changed
/stable/HeuristicLab.Clients.Hive reverse-merged: 15587 /trunk/HeuristicLab.Clients.Hive (added) merged: 16117,16202,16204-16205,16208-16209,16356,16389
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Clients.Hive.Administrator
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Clients.Hive.JobManager
- Property svn:mergeinfo changed
/stable/HeuristicLab.Clients.Hive.JobManager reverse-merged: 15587 /trunk/HeuristicLab.Clients.Hive.JobManager (added) merged: 16117,16187,16202,16205,16209,16219,16356,16389
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Clients.Hive.Slave
- Property svn:mergeinfo changed
/stable/HeuristicLab.Clients.Hive.Slave reverse-merged: 15587 /trunk/HeuristicLab.Clients.Hive.Slave (added) merged: 16117,16356,16389
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Clients.Hive.Slave.App
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Clients.Hive.Slave.ConsoleClient
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Clients.Hive.Slave.TrayIcon
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Clients.Hive.Slave.Views
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Clients.Hive.Slave.WindowsService
- Property svn:mergeinfo changed
/stable/HeuristicLab.Clients.Hive.Slave.WindowsService reverse-merged: 15587 /trunk/HeuristicLab.Clients.Hive.Slave.WindowsService (added) merged: 16117,16356,16389
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Clients.Hive.Views
- Property svn:mergeinfo changed
/stable/HeuristicLab.Clients.Hive.Views reverse-merged: 15587 /trunk/HeuristicLab.Clients.Hive.Views (added) merged: 16117,16356,16389
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Clients.OKB
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Clients.OKB.Views
- Property svn:mergeinfo changed
/stable/HeuristicLab.Clients.OKB.Views reverse-merged: 15587 /trunk/HeuristicLab.Clients.OKB.Views (added) merged: 16024-16025,16032-16033,16117,16356,16389
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.CodeEditor
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Collections
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Common
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Common.Resources
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Core
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Core (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.Core (added) merged: 15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Core.Views
- Property svn:mergeinfo changed
/stable/HeuristicLab.Core.Views reverse-merged: 15587 /trunk/HeuristicLab.Core.Views (added) merged: 15706-15707,16117,16356,16389
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Core.Views/3.3/TypeSelector.cs
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Core.Views/3.3/TypeSelector.cs (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.Core.Views/3.3/TypeSelector.cs (added) merged: 15583
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Data
- Property svn:mergeinfo changed
/stable/HeuristicLab.Data reverse-merged: 15587 /trunk/HeuristicLab.Data (added) merged: 15931-15932,15934,16117,16280,16356,16389
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Data.Views
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Data.Views (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.Data.Views (added) merged: 15548,15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Data.Views/3.3
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Data.Views/3.3 (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.Data.Views/3.3 (added) merged: 15548,15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Data/3.3
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Data/3.3 (added) merged: 15931-15932,15934,16117,16280,16356,16389 /trunk/sources/HeuristicLab.Data/3.3 (added) merged: 15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.DataPreprocessing
- Property svn:mergeinfo changed
/trunk/HeuristicLab.DataPreprocessing (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.DataPreprocessing (added) merged: 15518,15581,15583,15589,15594
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.DataPreprocessing.Views
- Property svn:mergeinfo changed
/trunk/HeuristicLab.DataPreprocessing.Views (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.DataPreprocessing.Views (added) merged: 15518,15534,15581,15583,15589,15598
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.DataPreprocessing/3.4
- Property svn:mergeinfo changed
/trunk/HeuristicLab.DataPreprocessing/3.4 (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.DataPreprocessing/3.4 (added) merged: 15518,15581,15583,15589,15594
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.DebugEngine
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.DebugEngine.Views
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Encodings.BinaryVectorEncoding
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Encodings.BinaryVectorEncoding (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding (added) merged: 15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Encodings.IntegerVectorEncoding
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Encodings.IntegerVectorEncoding (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding (added) merged: 15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Encodings.LinearLinkageEncoding
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Encodings.PermutationEncoding
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Encodings.PermutationEncoding (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.Encodings.PermutationEncoding (added) merged: 15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Encodings.PermutationEncoding.Views
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Encodings.RealVectorEncoding
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Encodings.RealVectorEncoding (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.Encodings.RealVectorEncoding (added) merged: 15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Encodings.ScheduleEncoding
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Encodings.ScheduleEncoding.Views
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.ExtLibs
- Property svn:mergeinfo changed
/trunk/HeuristicLab.ExtLibs (added) merged: 15972,16117,16266,16269,16274,16309,16333-16334,16343,16356,16389 /trunk/sources/HeuristicLab.ExtLibs (added) merged: 15581,15583
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.ExtLibs.sln
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.FxCop.dll
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Hive
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.MainForm
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Operators
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Operators.Programmable
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Operators.Programmable.Views
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Operators.Views
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Operators.Views.GraphVisualization
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Operators.Views.GraphVisualization.Views
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Optimization
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Optimization (added) merged: 16117,16179,16356,16389 /trunk/sources/HeuristicLab.Optimization (added) merged: 15408-15409,15452,15560,15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Optimization.Operators
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Optimization.Views
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Optimizer
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Optimizer (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.Optimizer (added) merged: 15581,15583,15589,15591
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.ParallelEngine
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.ParallelEngine.Views
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Parameters
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Parameters.Views
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Persistence
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Persistence (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.Persistence (added) merged: 15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Persistence.GUI
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.PluginInfrastructure
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.BinPacking
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Problems.BinPacking (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.Problems.BinPacking merged: 15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.BinPacking.Views
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Problems.BinPacking.Views (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.Problems.BinPacking.Views merged: 15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.Binary
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.DataAnalysis
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis.Views
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Views
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.DataAnalysis.Trading
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.DataAnalysis.Trading.Views
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.DataAnalysis.Views
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.DataAnalysis/3.4
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.ExternalEvaluation
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.ExternalEvaluation.GP
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.ExternalEvaluation.Matlab
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.ExternalEvaluation.Scilab
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.ExternalEvaluation.Views
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.GeneticProgramming
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.GeneticProgramming.Views
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.GrammaticalEvolution
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Problems.GrammaticalEvolution (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.Problems.GrammaticalEvolution (added) merged: 15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.GraphColoring
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.Instances
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Problems.Instances (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.Problems.Instances merged: 15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.Instances.CordeauGQAP
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.Instances.DIMACS
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.Instances.DataAnalysis
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.Instances.DataAnalysis.Views
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Problems.Instances.DataAnalysis.Views (added) merged: 16054,16117,16356,16389 /trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis.Views (added) merged: 15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.Instances.ElloumiCTAP
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.Instances.Orienteering
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.Instances.QAPLIB
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.Instances.Scheduling
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.Instances.TSPLIB
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.Instances.TSPLIB.Views
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Problems.Instances.TSPLIB.Views (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.Problems.Instances.TSPLIB.Views (added) merged: 15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.Instances.VehicleRouting
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.Instances.VehicleRouting.Views
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.Instances.Views
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.Knapsack
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.Knapsack.Views
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.LinearAssignment
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.LinearAssignment.Views
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.NK
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.Orienteering
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.Orienteering.Views
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.PTSP
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.PTSP.Views
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.ParameterOptimization
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.Programmable
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.Programmable.Views
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.QuadraticAssignment
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Problems.QuadraticAssignment (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.Problems.QuadraticAssignment (added) merged: 15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.QuadraticAssignment.Algorithms
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.QuadraticAssignment.Views
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Problems.QuadraticAssignment.Views (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.Problems.QuadraticAssignment.Views (added) merged: 15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.Scheduling
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.Scheduling.Views
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.TestFunctions
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Problems.TestFunctions (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.Problems.TestFunctions (added) merged: 15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.TestFunctions.MultiObjective
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.TestFunctions.Views
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.TravelingSalesman
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Problems.TravelingSalesman.Views
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Problems.TravelingSalesman.Views (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.Problems.TravelingSalesman.Views (added) merged: 15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Problems.VehicleRouting (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.Problems.VehicleRouting (added) merged: 15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.VehicleRouting.Views
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Problems.VehicleRouting.Views (added) merged: 16117,16356,16389 /trunk/sources/HeuristicLab.Problems.VehicleRouting.Views (added) merged: 15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Random
- Property svn:mergeinfo changed
/stable/HeuristicLab.Random reverse-merged: 15587 /trunk/HeuristicLab.Random (added) merged: 16071,16117,16356,16389
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Scripting
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Scripting.Views
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Selection
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.SequentialEngine
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Services.Access
- Property svn:mergeinfo changed
/stable/HeuristicLab.Services.Access reverse-merged: 15587 /trunk/HeuristicLab.Services.Access (added) merged: 16117,16356,16389
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Services.Access.DataAccess
- Property svn:mergeinfo changed
/stable/HeuristicLab.Services.Access.DataAccess reverse-merged: 15587 /trunk/HeuristicLab.Services.Access.DataAccess (added) merged: 16117,16356,16389
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Services.Deployment
- Property svn:mergeinfo changed
/stable/HeuristicLab.Services.Deployment reverse-merged: 15587 /trunk/HeuristicLab.Services.Deployment (added) merged: 16117,16356,16389
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Services.Deployment.DataAccess
- Property svn:mergeinfo changed
/stable/HeuristicLab.Services.Deployment.DataAccess reverse-merged: 15587 /trunk/HeuristicLab.Services.Deployment.DataAccess (added) merged: 16117,16356,16389
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Services.Hive
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Services.Hive (added) merged: 16117,16187,16203,16208-16209,16356,16389 /trunk/sources/HeuristicLab.Services.Hive (added) merged: 15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Services.Hive.DataAccess
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Services.Hive.DataAccess (added) merged: 16117,16257,16356,16389 /trunk/sources/HeuristicLab.Services.Hive.DataAccess (added) merged: 15581,15583,15589
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Services.Hive.JanitorService
- Property svn:mergeinfo changed
/stable/HeuristicLab.Services.Hive.JanitorService reverse-merged: 15587 /trunk/HeuristicLab.Services.Hive.JanitorService (added) merged: 16117,16356,16389
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Services.Hive.Web
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Services.Hive.Web (added) merged: 16117,16356,16389
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Services.OKB
- Property svn:mergeinfo changed
/stable/HeuristicLab.Services.OKB reverse-merged: 15587 /trunk/HeuristicLab.Services.OKB (added) merged: 16117,16356,16389
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Services.OKB.DataAccess
- Property svn:mergeinfo changed
/stable/HeuristicLab.Services.OKB.DataAccess reverse-merged: 15587 /trunk/HeuristicLab.Services.OKB.DataAccess (added) merged: 16117,16356,16389
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Services.WebApp
- Property svn:mergeinfo changed
/stable/HeuristicLab.Services.WebApp reverse-merged: 15587 /trunk/HeuristicLab.Services.WebApp (added) merged: 16117,16356,16389
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Services.WebApp.Maintenance
- Property svn:mergeinfo changed
/stable/HeuristicLab.Services.WebApp.Maintenance reverse-merged: 15587 /trunk/HeuristicLab.Services.WebApp.Maintenance (added) merged: 16117,16356,16389
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Services.WebApp.Statistics
- Property svn:mergeinfo changed
/stable/HeuristicLab.Services.WebApp.Statistics reverse-merged: 15587 /trunk/HeuristicLab.Services.WebApp.Statistics (added) merged: 16117,16356,16389
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Services.WebApp.Status
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Tests
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Tracing
- Property svn:mergeinfo deleted
-
trunk/HeuristicLab.Visualization.ChartControlsExtensions
- Property svn:mergeinfo deleted
-
trunk/Installers
- Property svn:mergeinfo deleted
-
trunk/MergeConfigs.cmd
- Property svn:mergeinfo deleted
-
trunk/MergeConfigs.sh
- Property svn:mergeinfo deleted
-
trunk/PreBuildEvent.cmd
- Property svn:mergeinfo deleted
-
trunk/PreBuildEvent.sh
- Property svn:mergeinfo deleted
-
trunk/Test.cmd
- Property svn:mergeinfo deleted
-
trunk/prepareProjectsForMono.sh
- Property svn:mergeinfo deleted
Note: See TracChangeset
for help on using the changeset viewer.