- Timestamp:
- 09/14/12 18:58:15 (12 years ago)
- Location:
- branches/GP-MoveOperators
- Files:
-
- 13 deleted
- 627 edited
- 116 copied
-
branches/GP-MoveOperators
- Property svn:ignore
-
old new 21 21 protoc.exe 22 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/GP-MoveOperators/HeuristicLab.Algorithms.DataAnalysis/3.4
- Property svn:ignore
-
old new 5 5 *.vs10x 6 6 Plugin.cs 7 *.user
-
- Property svn:ignore
-
branches/GP-MoveOperators/HeuristicLab.Analysis
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Analysis merged: 8246,8280,8282-8283,8289,8404-8405,8448,8452,8478,8600
- Property svn:mergeinfo changed
-
branches/GP-MoveOperators/HeuristicLab.Clients.Access.Administration/3.3
- Property svn:ignore
-
old new 1 1 Plugin.cs 2 2 obj 3 *.user
-
- Property svn:ignore
-
branches/GP-MoveOperators/HeuristicLab.Clients.Access.Views/3.3
- Property svn:ignore
-
old new 1 1 Plugin.cs 2 2 obj 3 *.user
-
- Property svn:ignore
-
branches/GP-MoveOperators/HeuristicLab.Clients.Access/3.3
- Property svn:ignore
-
old new 1 1 Plugin.cs 2 2 obj 3 *.user
-
- Property svn:ignore
-
branches/GP-MoveOperators/HeuristicLab.Clients.OKB.Views/3.3
- Property svn:ignore
-
old new 1 1 Plugin.cs 2 2 obj 3 *.user
-
- Property svn:ignore
-
branches/GP-MoveOperators/HeuristicLab.Clients.OKB/3.3
- Property svn:ignore
-
old new 1 1 Plugin.cs 2 2 obj 3 *.user
-
- Property svn:ignore
-
branches/GP-MoveOperators/HeuristicLab.DebugEngine.Views/3.3
- Property svn:ignore
-
old new 2 2 obj 3 3 Plugin.cs 4 *.user
-
- Property svn:ignore
-
branches/GP-MoveOperators/HeuristicLab.Encodings.IntegerVectorEncoding
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding merged: 8246,8600
- Property svn:mergeinfo changed
-
branches/GP-MoveOperators/HeuristicLab.Encodings.PermutationEncoding
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Encodings.PermutationEncoding (added) merged: 8246,8338,8600
- Property svn:mergeinfo changed
-
branches/GP-MoveOperators/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding merged: 8246,8311,8333,8344,8476,8561,8600
- Property svn:mergeinfo changed
-
branches/GP-MoveOperators/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/GP-MoveOperators/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/GP-MoveOperators/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/GP-MoveOperators/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/GP-MoveOperators/HeuristicLab.Persistence
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Persistence (added) merged: 8246,8588,8600
- Property svn:mergeinfo changed
-
branches/GP-MoveOperators/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/GP-MoveOperators/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/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis
- Property svn:mergeinfo changed
-
branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification merged eligible /trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification merged eligible /branches/Algorithms.GradientDescent/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification 6917-7005 /branches/CloningRefactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification 5815-6180 /branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification 4458-4459,4462,4464 /branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification 5060 /branches/NET40/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification 5138-5162 /branches/ParallelEngine/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification 6828 /branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification 7787-8333 /branches/SuccessProgressAnalysis/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification 5370-5682 /branches/Trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification 6829-6865 /branches/VNS/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification 5594-5752 /branches/histogram/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/GP-MoveOperators/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/GP-MoveOperators/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/GP-MoveOperators/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/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis.Views
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views merged eligible /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis.Views merged eligible /trunk/sources/HeuristicLab.Problems.DataAnalysis.Views merged eligible /branches/Algorithms.GradientDescent/HeuristicLab.Problems.DataAnalysis.Views 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Problems.DataAnalysis.Views 6917-7005 /branches/CloningRefactoring/HeuristicLab.Problems.DataAnalysis.Views 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.DataAnalysis.Views 5815-6180 /branches/DatasetFeatureCorrelation/HeuristicLab.Problems.DataAnalysis.Views 8036-8538 /branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Views 6284-6795 /branches/NET40/sources/HeuristicLab.Problems.DataAnalysis.Views 5138-5162 /branches/ParallelEngine/HeuristicLab.Problems.DataAnalysis.Views 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Views 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Problems.DataAnalysis.Views 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Problems.DataAnalysis.Views 6828 /branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.DataAnalysis.Views 7787-8333 /branches/SuccessProgressAnalysis/HeuristicLab.Problems.DataAnalysis.Views 5370-5682 /branches/Trunk/HeuristicLab.Problems.DataAnalysis.Views 6829-6865 /branches/VNS/HeuristicLab.Problems.DataAnalysis.Views 5594-5752 /branches/histogram/HeuristicLab.Problems.DataAnalysis.Views 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/GP-MoveOperators/HeuristicLab.Problems.Instances
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.Instances merged: 8246,8600
- Property svn:mergeinfo changed
-
branches/GP-MoveOperators/HeuristicLab.Problems.LawnMower.Views/3.3
- Property svn:ignore
-
old new 2 2 obj 3 3 Plugin.cs 4 *.user
-
- Property svn:ignore
-
branches/GP-MoveOperators/HeuristicLab.Problems.LinearAssignment.Views/3.3
- Property svn:ignore
-
old new 2 2 Plugin.cs 3 3 bin 4 *.user
-
- Property svn:ignore
-
branches/GP-MoveOperators/HeuristicLab.Problems.LinearAssignment/3.3
- Property svn:ignore
-
old new 2 2 Plugin.cs 3 3 bin 4 *.user
-
- Property svn:ignore
-
branches/GP-MoveOperators/HeuristicLab.Problems.QuadraticAssignment
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.QuadraticAssignment merged: 8246,8338,8553,8600
- Property svn:mergeinfo changed
-
branches/GP-MoveOperators/HeuristicLab.Problems.QuadraticAssignment.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.QuadraticAssignment.Views merged: 8246,8600
- Property svn:mergeinfo changed
-
branches/GP-MoveOperators/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.VehicleRouting merged: 8231,8246,8346,8455,8497,8600
- Property svn:mergeinfo changed
-
branches/GP-MoveOperators/HeuristicLab.Problems.VehicleRouting.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.VehicleRouting.Views merged: 8246,8455,8600
- Property svn:mergeinfo changed
-
branches/GP-MoveOperators/HeuristicLab.Tests
- Property svn:ignore
-
old new 4 4 *.vs10x 5 5 _ReSharper.HeuristicLab 3.3 Tests 6 *.user
-
- Property svn:mergeinfo changed
- Property svn:ignore
Note: See TracChangeset
for help on using the changeset viewer.