Changeset 9363
- Timestamp:
- 04/16/13 13:13:41 (10 years ago)
- Location:
- branches/OaaS
- Files:
-
- 25 deleted
- 1089 edited
- 234 copied
-
branches/OaaS
- Property svn:ignore
-
old new 21 21 protoc.exe 22 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll 23 24 packages
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Algorithms.DataAnalysis
- Property svn:mergeinfo changed
-
branches/OaaS/HeuristicLab.Algorithms.DataAnalysis/3.4
- Property svn:ignore
-
old new 5 5 *.vs10x 6 6 Plugin.cs 7 *.user
-
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Analysis
- Property svn:mergeinfo changed
-
branches/OaaS/HeuristicLab.Analysis.Views
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/sources/HeuristicLab.Analysis.Views merged eligible /branches/Algorithms.GradientDescent/HeuristicLab.Analysis.Views 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Analysis.Views 6917-7005 /branches/CMAES/HeuristicLab.Analysis.Views 9141-9257 /branches/CloningRefactoring/HeuristicLab.Analysis.Views 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Analysis.Views 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Analysis.Views 5815-6180 /branches/DataAnalysis/HeuristicLab.Analysis.Views 4458-4459,4462,4464 /branches/GP.Grammar.Editor/HeuristicLab.Analysis.Views 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Analysis.Views 5060 /branches/NET40/sources/HeuristicLab.Analysis.Views 5138-5162 /branches/ParallelEngine/HeuristicLab.Analysis.Views 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Analysis.Views 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Analysis.Views 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Analysis.Views 6828 /branches/RuntimeOptimizer/HeuristicLab.Analysis.Views 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Analysis.Views 7787-8333 /branches/SlaveShutdown/HeuristicLab.Analysis.Views 8944-8956 /branches/SuccessProgressAnalysis/HeuristicLab.Analysis.Views 5370-5682 /branches/Trunk/HeuristicLab.Analysis.Views 6829-6865 /branches/UnloadJobs/HeuristicLab.Analysis.Views 9168-9215 /branches/VNS/HeuristicLab.Analysis.Views 5594-5752 /branches/histogram/HeuristicLab.Analysis.Views 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/OaaS/HeuristicLab.Clients.Access.Administration/3.3
- Property svn:ignore
-
old new 1 1 Plugin.cs 2 2 obj 3 *.user
-
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Clients.Access.Views/3.3
- Property svn:ignore
-
old new 1 1 Plugin.cs 2 2 obj 3 *.user
-
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Clients.Access/3.3
- Property svn:ignore
-
old new 1 1 Plugin.cs 2 2 obj 3 *.user
-
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Clients.OKB.Views/3.3
- Property svn:ignore
-
old new 1 1 Plugin.cs 2 2 obj 3 *.user
-
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Clients.OKB/3.3
- Property svn:ignore
-
old new 1 1 Plugin.cs 2 2 obj 3 *.user
-
- Property svn:ignore
-
branches/OaaS/HeuristicLab.DebugEngine.Views/3.3
- Property svn:ignore
-
old new 2 2 obj 3 3 Plugin.cs 4 *.user
-
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Encodings.IntegerVectorEncoding
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding (added) merged: 8246,8600,8790,8806
- Property svn:mergeinfo changed
-
branches/OaaS/HeuristicLab.Encodings.PermutationEncoding
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Encodings.PermutationEncoding (added) merged: 8246,8338,8600
- Property svn:mergeinfo changed
-
branches/OaaS/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding
- Property svn:mergeinfo changed
-
branches/OaaS/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views merged eligible /branches/Algorithms.GradientDescent/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views 6917-7005 /branches/CloningRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views 5815-6180 /branches/DataAnalysis/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views 4458-4459,4462,4464 /branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views 5060 /branches/HeuristicLab.TreeSimplifier/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views 8388-8940 /branches/NET40/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views 5138-5162 /branches/ParallelEngine/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views 6828 /branches/RuntimeOptimizer/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views 7787-8333 /branches/SlaveShutdown/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views 8944-8956 /branches/SuccessProgressAnalysis/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views 5370-5682 /branches/Trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views 6829-6865 /branches/UnloadJobs/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views 9168-9215 /branches/VNS/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views 5594-5752 /branches/histogram/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/OaaS/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4
- Property svn:ignore
-
old new 5 5 HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj.user 6 6 Plugin.cs 7 *.user
-
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/Properties
- Property svn:ignore
--- +++
- Property svn:ignore
-
branches/OaaS/HeuristicLab.ExtLibs/HeuristicLab.DayView/1.0
- Property svn:ignore
-
old new 3 3 HeuristicLab.DayView-1.0.csproj.user 4 4 *.vs10x 5 *.user
-
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Operators.Views.GraphVisualization.Views/3.3
- Property svn:ignore
-
old new 4 4 HeuristicLab.Operators.Views.GraphVisualization.Views-3.3.csproj.user 5 5 *.vs10x 6 *.user
-
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Optimization.Views
- Property svn:mergeinfo deleted
-
branches/OaaS/HeuristicLab.ParallelEngine/3.3
- Property svn:ignore
-
old new 5 5 HeuristicLab.ParallelEngine-3.3.csproj.user 6 6 Plugin.cs 7 *.user
-
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Persistence
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Persistence (added) merged: 8246,8588,8600,8641,8647,8698-8699,8924,9005,9014-9015,9018
- Property svn:mergeinfo changed
-
branches/OaaS/HeuristicLab.Problems.ArtificialAnt.Views/3.4
- Property svn:ignore
-
old new 5 5 HeuristicLab.Problems.ArtificialAnt.Views-3.4.csproj.user 6 6 Plugin.cs 7 *.user
-
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Problems.ArtificialAnt/3.4
- Property svn:ignore
-
old new 5 5 HeuristicLab.Problems.ArtificialAnt-3.4.csproj.user 6 6 Plugin.cs 7 *.user
-
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Problems.DataAnalysis
- Property svn:mergeinfo changed
-
branches/OaaS/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed
-
branches/OaaS/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification
- Property svn:mergeinfo changed
-
branches/OaaS/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views merged eligible /branches/Algorithms.GradientDescent/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views 6917-7005 /branches/CloningRefactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views 5815-6180 /branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views 4458-4459,4462,4464 /branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views 5060 /branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views 8916-8942 /branches/NET40/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views 5138-5162 /branches/ParallelEngine/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views 6828 /branches/RuntimeOptimizer/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views 7787-8333 /branches/SlaveShutdown/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views 8944-8956 /branches/SuccessProgressAnalysis/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views 5370-5682 /branches/Trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views 6829-6865 /branches/UnloadJobs/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views 9168-9215 /branches/VNS/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views 5594-5752 /branches/histogram/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/OaaS/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4
- Property svn:ignore
-
old new 5 5 *.vs10x 6 6 Plugin.cs 7 *.user
-
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4
- Property svn:ignore
-
old new 1 *.user 2 Plugin.cs 1 3 bin 2 *.user3 HeuristicLabProblemsDataAnalysisSymbolicClassificationPlugin.cs4 4 obj 5 *.vs10x6 Plugin.cs
-
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/Properties
- Property svn:ignore
--- +++
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression
- Property svn:mergeinfo changed
-
branches/OaaS/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views merged eligible /branches/Algorithms.GradientDescent/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views 6917-7005 /branches/CloningRefactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views 5700-5808 /branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views 5815-6180 /branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views 4458-4459,4462,4464 /branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views 5060 /branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views 8916-8942 /branches/NET40/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views 5138-5162 /branches/ParallelEngine/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views 6828 /branches/RuntimeOptimizer/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views 7787-8333 /branches/SlaveShutdown/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views 8944-8956 /branches/SuccessProgressAnalysis/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views 5370-5682 /branches/Trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views 6829-6865 /branches/UnloadJobs/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views 9168-9215 /branches/VNS/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views 5594-5752 /branches/histogram/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/OaaS/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4
- Property svn:ignore
-
old new 5 5 *.vs10x 6 6 Plugin.cs 7 *.user
-
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4
- Property svn:ignore
-
old new 1 *.user 2 Plugin.cs 1 3 bin 2 *.user3 HeuristicLabProblemsDataAnalysisSymbolicRegressionPlugin.cs4 4 obj 5 *.vs10x6 Plugin.cs
-
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/Properties
- Property svn:ignore
--- +++
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Problems.DataAnalysis.Symbolic.Views
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views merged eligible /branches/Algorithms.GradientDescent/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 6917-7005 /branches/CloningRefactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 5815-6180 /branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 4458-4459,4462,4464 /branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 5060 /branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 8388-8942 /branches/NET40/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 5138-5162 /branches/ParallelEngine/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 6828 /branches/RuntimeOptimizer/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 7787-8333 /branches/SlaveShutdown/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 8944-8956 /branches/SuccessProgressAnalysis/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 5370-5682 /branches/Trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 6829-6865 /branches/UnloadJobs/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 9168-9215 /branches/VNS/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 5594-5752 /branches/histogram/HeuristicLab.Problems.DataAnalysis.Symbolic.Views 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/OaaS/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4
- Property svn:ignore
-
old new 1 *.user 2 Plugin.cs 1 3 bin 2 4 obj 3 *.user4 HeuristicLabProblemsDataAnalysisSymbolicViewsPlugin.cs5 *.vs10x6 Plugin.cs
-
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Properties
- Property svn:ignore
--- +++
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4
- Property svn:ignore
-
old new 1 *.user 2 Plugin.cs 1 3 bin 2 *.user3 HeuristicLabProblemsDataAnalysisSymbolicPlugin.cs4 4 obj 5 *.vs10x6 Plugin.cs
-
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Properties
- Property svn:ignore
--- +++
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Problems.DataAnalysis.Views
- Property svn:mergeinfo changed
-
branches/OaaS/HeuristicLab.Problems.Instances
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.Instances merged: 8246,8600,8882,8904
- Property svn:mergeinfo changed
-
branches/OaaS/HeuristicLab.Problems.Instances.DataAnalysis
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis merged eligible /branches/Algorithms.GradientDescent/HeuristicLab.Problems.Instances.DataAnalysis 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Problems.Instances.DataAnalysis 6917-7005 /branches/CloningRefactoring/HeuristicLab.Problems.Instances.DataAnalysis 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Problems.Instances.DataAnalysis 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.Instances.DataAnalysis 5815-6180 /branches/DataAnalysis/HeuristicLab.Problems.Instances.DataAnalysis 4458-4459,4462,4464 /branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis 8695-8875 /branches/GP.Grammar.Editor/HeuristicLab.Problems.Instances.DataAnalysis 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.Instances.DataAnalysis 5060 /branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.Instances.DataAnalysis 7889-8789 /branches/NET40/sources/HeuristicLab.Problems.Instances.DataAnalysis 5138-5162 /branches/ParallelEngine/HeuristicLab.Problems.Instances.DataAnalysis 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.DataAnalysis 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Problems.Instances.DataAnalysis 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Problems.Instances.DataAnalysis 6828 /branches/RuntimeOptimizer/HeuristicLab.Problems.Instances.DataAnalysis 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.Instances.DataAnalysis 7787-8333 /branches/SlaveShutdown/HeuristicLab.Problems.Instances.DataAnalysis 8944-8956 /branches/SuccessProgressAnalysis/HeuristicLab.Problems.Instances.DataAnalysis 5370-5682 /branches/Trunk/HeuristicLab.Problems.Instances.DataAnalysis 6829-6865 /branches/UnloadJobs/HeuristicLab.Problems.Instances.DataAnalysis 9168-9215 /branches/VNS/HeuristicLab.Problems.Instances.DataAnalysis 5594-5752 /branches/histogram/HeuristicLab.Problems.Instances.DataAnalysis 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/OaaS/HeuristicLab.Problems.Instances.DataAnalysis.Views
- Property svn:mergeinfo changed
-
branches/OaaS/HeuristicLab.Problems.Instances.TSPLIB.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.Instances.TSPLIB.Views (added) merged: 8246,8600,8924
- Property svn:mergeinfo changed
-
branches/OaaS/HeuristicLab.Problems.LawnMower.Views/3.3
- Property svn:ignore
-
old new 2 2 obj 3 3 Plugin.cs 4 *.user
-
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Problems.LinearAssignment.Views/3.3
- Property svn:ignore
-
old new 2 2 Plugin.cs 3 3 bin 4 *.user
-
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Problems.LinearAssignment/3.3
- Property svn:ignore
-
old new 2 2 Plugin.cs 3 3 bin 4 *.user
-
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Problems.QuadraticAssignment
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.QuadraticAssignment (added) merged: 8246,8338,8553,8600,8846-8847,8910,9029
- Property svn:mergeinfo changed
-
branches/OaaS/HeuristicLab.Problems.QuadraticAssignment.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.QuadraticAssignment.Views (added) merged: 8246,8600,8882
- Property svn:mergeinfo changed
-
branches/OaaS/HeuristicLab.Problems.TestFunctions
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/sources/HeuristicLab.Problems.TestFunctions merged eligible /branches/Algorithms.GradientDescent/HeuristicLab.Problems.TestFunctions 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Problems.TestFunctions 6917-7005 /branches/CMAES/HeuristicLab.Problems.TestFunctions 9121-9257 /branches/CloningRefactoring/HeuristicLab.Problems.TestFunctions 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Problems.TestFunctions 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.TestFunctions 5815-6180 /branches/DataAnalysis/HeuristicLab.Problems.TestFunctions 4458-4459,4462,4464 /branches/GP.Grammar.Editor/HeuristicLab.Problems.TestFunctions 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.TestFunctions 5060 /branches/NET40/sources/HeuristicLab.Problems.TestFunctions 5138-5162 /branches/ParallelEngine/HeuristicLab.Problems.TestFunctions 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.TestFunctions 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Problems.TestFunctions 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Problems.TestFunctions 6828 /branches/RuntimeOptimizer/HeuristicLab.Problems.TestFunctions 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TestFunctions 7787-8333 /branches/SlaveShutdown/HeuristicLab.Problems.TestFunctions 8944-8956 /branches/SuccessProgressAnalysis/HeuristicLab.Problems.TestFunctions 5370-5682 /branches/Trunk/HeuristicLab.Problems.TestFunctions 6829-6865 /branches/UnloadJobs/HeuristicLab.Problems.TestFunctions 9168-9215 /branches/VNS/HeuristicLab.Problems.TestFunctions 5594-5752 /branches/histogram/HeuristicLab.Problems.TestFunctions 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/OaaS/HeuristicLab.Problems.TravelingSalesman.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.TravelingSalesman.Views (added) merged: 8246,8600
- Property svn:mergeinfo changed
-
branches/OaaS/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.VehicleRouting (added) merged: 8231,8246,8346,8455,8497,8600,8649,8651-8653,8720,8763,8894,8899,8905,8922,9010,9321
- Property svn:mergeinfo changed
-
branches/OaaS/HeuristicLab.Problems.VehicleRouting.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.VehicleRouting.Views (added) merged: 8246,8455,8600,8651,8924
- Property svn:mergeinfo changed
-
branches/OaaS/HeuristicLab.Services.Hive
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/sources/HeuristicLab.Services.Hive merged eligible /branches/Algorithms.GradientDescent/HeuristicLab.Services.Hive 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Services.Hive 6917-7005 /branches/CloningRefactoring/HeuristicLab.Services.Hive 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Services.Hive 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Services.Hive 5815-6180 /branches/DataAnalysis/HeuristicLab.Services.Hive 4458-4459,4462,4464 /branches/GP.Grammar.Editor/HeuristicLab.Services.Hive 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Services.Hive 5060 /branches/HiveTaskScheduler/HeuristicLab.Services.Hive 8687-9106 /branches/NET40/sources/HeuristicLab.Services.Hive 5138-5162 /branches/ParallelEngine/HeuristicLab.Services.Hive 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Services.Hive 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Services.Hive 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Services.Hive 6828 /branches/RuntimeOptimizer/HeuristicLab.Services.Hive 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Services.Hive 7787-8333 /branches/SlaveShutdown/HeuristicLab.Services.Hive 8944-8956 /branches/SuccessProgressAnalysis/HeuristicLab.Services.Hive 5370-5682 /branches/Trunk/HeuristicLab.Services.Hive 6829-6865 /branches/UnloadJobs/HeuristicLab.Services.Hive 9168-9215 /branches/VNS/HeuristicLab.Services.Hive 5594-5752 /branches/histogram/HeuristicLab.Services.Hive 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/OaaS/HeuristicLab.Services.Hive.DataAccess
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/sources/HeuristicLab.Services.Hive.DataAccess merged eligible /branches/Algorithms.GradientDescent/HeuristicLab.Services.Hive.DataAccess 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Services.Hive.DataAccess 6917-7005 /branches/CloningRefactoring/HeuristicLab.Services.Hive.DataAccess 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Services.Hive.DataAccess 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Services.Hive.DataAccess 5815-6180 /branches/DataAnalysis/HeuristicLab.Services.Hive.DataAccess 4458-4459,4462,4464 /branches/GP.Grammar.Editor/HeuristicLab.Services.Hive.DataAccess 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Services.Hive.DataAccess 5060 /branches/HiveTaskScheduler/HeuristicLab.Services.Hive.DataAccess 8687-9106 /branches/NET40/sources/HeuristicLab.Services.Hive.DataAccess 5138-5162 /branches/ParallelEngine/HeuristicLab.Services.Hive.DataAccess 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Services.Hive.DataAccess 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Services.Hive.DataAccess 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Services.Hive.DataAccess 6828 /branches/RuntimeOptimizer/HeuristicLab.Services.Hive.DataAccess 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Services.Hive.DataAccess 7787-8333 /branches/SlaveShutdown/HeuristicLab.Services.Hive.DataAccess 8944-8956 /branches/SuccessProgressAnalysis/HeuristicLab.Services.Hive.DataAccess 5370-5682 /branches/Trunk/HeuristicLab.Services.Hive.DataAccess 6829-6865 /branches/UnloadJobs/HeuristicLab.Services.Hive.DataAccess 9168-9215 /branches/VNS/HeuristicLab.Services.Hive.DataAccess 5594-5752 /branches/histogram/HeuristicLab.Services.Hive.DataAccess 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/OaaS/HeuristicLab.Tests
- Property svn:ignore
-
old new 4 4 *.vs10x 5 5 _ReSharper.HeuristicLab 3.3 Tests 6 *.user 7 *.suo
-
- Property svn:mergeinfo changed
- Property svn:ignore
Note: See TracChangeset
for help on using the changeset viewer.