Context Navigation

← Previous Change
Next Change →

AssemblyInfo.cs.frame

Timestamp:

03/28/19 16:54:20 (6 years ago)

Author:

abeham

Message:

#2521: merged changes from r15684 to trunk HEAD (r16716) and resolved all merge conflicts

it doesn't build

Location:

branches/2521_ProblemRefactoring

Files:

: 3 edited

. (modified) (1 prop)
HeuristicLab.Services.Access.DataAccess (modified) (1 prop)
HeuristicLab.Services.Access.DataAccess/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/2521_ProblemRefactoring

Property svn:mergeinfo changed

/branches/2520_PersistenceReintegration (added)	merged: 16451-16454,16462,16465-16468,16470-16472,16474,16476-16477,16479-16487,16529-16530,16539,16551-16555,16558-16559,16562-16564
/branches/2839_HiveProjectManagement (added)	merged: 15761,15767-15768,15777,15792,15813,15819,15908,15913-15914,15920,15922,15925,15933,15953-15956,15966,15969,15978,15992,15995,16040,16043-16044,16050,16057,16060,16062,16064,16066,16068,16072,16089,16091-16095,16116
/branches/2892_LR-prediction-intervals (added)	merged: 15743-15744,16388
/branches/2915-AbsoluteSymbol (added)	merged: 15943-15944,16236-16240,16304,16306,16332,16344-16352,16355
/branches/2916_IndexedDataTableSerialization (added)	merged: 15918
/branches/2937_SymReg_AnalyticalQuotient (added)	merged: 16083
/branches/2947_ConfigurableIndexedDataTable (added)	merged: 16148-16150,16156,16520,16524
/branches/2965_CancelablePersistence (added)	merged: 16321,16325,16433,16439
/branches/2972_PDPRowSelect (added)	merged: 16444-16445,16516-16518
/branches/HiveProjectManagement (added)	merged: 15377-15380,15399,15401,15411-15412,15422,15496-15497,15500,15503,15508,15523,15526-15528,15530,15540,15546-15547,15552,15557,15559,15567,15576-15577,15580,15627-15628,15630,15641-15644,15658-15659,15666,15671,15715-15716,15737,15742,15760
/trunk (added)	merged: 15706-15708,15727-15730,15738-15739,15751-15755,15766,15769,15782-15783,15785-15787,15789-15790,15793,15796-15799,15802,15810,15818,15829,15839,15845,15853-15855,15869,15871,15882,15891,15902,15931-15932,15934,15940,15951-15952,15972,15983,15998-15999,16015,16021,16023-16025,16032-16033,16054,16059,16063,16071,16084-16086,16117-16118,16120,16122,16168-16169,16177,16179,16184-16187,16202-16209,16211,16213,16216,16218-16219,16221,16223-16224,16232,16241-16244,16252,16255,16257-16261,16263-16264,16266-16267,16269-16274,16276-16280,16283-16287,16289-16294,16296-16298,16301-16302,16305,16309,16333-16334,16341-16343,16356-16362,16365-16366,16378-16379,16381-16382,16389,16392,16394,16407,16415,16422,16427,16430-16431,16440-16441,16443,16446,16448-16449,16478,16491,16494,16496,16499,16501-16506,16511-16513,16519,16526-16528,16542-16543,16565,16568-16569,16571-16572,16578-16579,16584-16585,16594-16595,16619,16622-16626,16629,16631,16646,16648,16651,16656,16658-16659,16661,16668,16670,16672,16681,16700-16704,16706-16707,16716
/trunk/sources	merged: 15682-15683

branches/2521_ProblemRefactoring/HeuristicLab.Services.Access.DataAccess

Property svn:mergeinfo set to (toggle deleted branches)

/branches/2520_PersistenceReintegration/HeuristicLab.Services.Access.DataAccess	merged	eligible
/branches/2839_HiveProjectManagement/HeuristicLab.Services.Access.DataAccess	merged	eligible
/branches/2947_ConfigurableIndexedDataTable/HeuristicLab.Services.Access.DataAccess	merged	eligible
/branches/2965_CancelablePersistence/HeuristicLab.Services.Access.DataAccess	merged	eligible
/stable/HeuristicLab.Services.Access.DataAccess	merged	eligible
/trunk/HeuristicLab.Services.Access.DataAccess	merged	eligible
/branches/1721-RandomForestPersistence/HeuristicLab.Services.Access.DataAccess	10321-10322
/branches/2892_LR-prediction-intervals/HeuristicLab.Services.Access.DataAccess	15743-16388
/branches/2915-AbsoluteSymbol/HeuristicLab.Services.Access.DataAccess	15943-16355
/branches/Algorithms.GradientDescent/HeuristicLab.Services.Access.DataAccess	5516-5520
/branches/Benchmarking/sources/HeuristicLab.Services.Access.DataAccess	6917-7005
/branches/CloningRefactoring/HeuristicLab.Services.Access.DataAccess	4656-4721
/branches/CodeEditor/HeuristicLab.Services.Access.DataAccess	11700-11806
/branches/DataAnalysis Refactoring/HeuristicLab.Services.Access.DataAccess	5471-5808
/branches/DataAnalysis SolutionEnsembles/HeuristicLab.Services.Access.DataAccess	5815-6180
/branches/DataAnalysis/HeuristicLab.Services.Access.DataAccess	4458-4459,4462,4464
/branches/DataPreprocessing/HeuristicLab.Services.Access.DataAccess	10085-11101
/branches/GP.Grammar.Editor/HeuristicLab.Services.Access.DataAccess	6284-6795
/branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Services.Access.DataAccess	5060
/branches/HLScript/HeuristicLab.Services.Access.DataAccess	10331-10358
/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.Access.DataAccess	11570-12508
/branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Services.Access.DataAccess	6123-9799
/branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Services.Access.DataAccess	11130-12721
/branches/HiveProjectManagement/HeuristicLab.Services.Access.DataAccess	15377-15760
/branches/HiveStatistics/sources/HeuristicLab.Services.Access.DataAccess	12440-12877
/branches/LogResidualEvaluator/HeuristicLab.Services.Access.DataAccess	10202-10483
/branches/NET40/sources/HeuristicLab.Services.Access.DataAccess	5138-5162
/branches/NSGA-II Changes/HeuristicLab.Services.Access.DataAccess	12033-12122
/branches/ParallelEngine/HeuristicLab.Services.Access.DataAccess	5175-5192
/branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Services.Access.DataAccess	7568-7810
/branches/QAPAlgorithms/HeuristicLab.Services.Access.DataAccess	6350-6627
/branches/Restructure trunk solution/HeuristicLab.Services.Access.DataAccess	6828
/branches/RuntimeOptimizer/HeuristicLab.Services.Access.DataAccess	8943-9078
/branches/ScatterSearch (trunk integration)/HeuristicLab.Services.Access.DataAccess	7787-8333
/branches/SlaveShutdown/HeuristicLab.Services.Access.DataAccess	8944-8956
/branches/SpectralKernelForGaussianProcesses/HeuristicLab.Services.Access.DataAccess	10204-10479
/branches/SuccessProgressAnalysis/HeuristicLab.Services.Access.DataAccess	5370-5682
/branches/Trunk/HeuristicLab.Services.Access.DataAccess	6829-6865
/branches/UnloadJobs/HeuristicLab.Services.Access.DataAccess	9168-9215
/branches/VNS/HeuristicLab.Services.Access.DataAccess	5594-5752
/branches/crossvalidation-2434/HeuristicLab.Services.Access.DataAccess	12948-12950
/branches/histogram/HeuristicLab.Services.Access.DataAccess	5959-6341

branches/2521_ProblemRefactoring/HeuristicLab.Services.Access.DataAccess/3.3/Properties/AssemblyInfo.cs.frame

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 16723 for branches/2521_ProblemRefactoring/HeuristicLab.Services.Access.DataAccess/3.3/Properties/AssemblyInfo.cs.frame

Legend:

branches/2521_ProblemRefactoring

branches/2521_ProblemRefactoring/HeuristicLab.Services.Access.DataAccess

branches/2521_ProblemRefactoring/HeuristicLab.Services.Access.DataAccess/3.3/Properties/AssemblyInfo.cs.frame

Download in other formats: