Context Navigation

← Previous Change
Next Change →

Plugin.cs.frame

Timestamp:

12/21/18 12:52:08 (6 years ago)

Author:

pfleck

Message:

#2845 merged branch into trunk
Reviewed by mkommenda

Location:

trunk

Files:

: 3 edited

. (modified) (1 prop)
HeuristicLab.Clients.Hive (modified) (1 prop)
HeuristicLab.Clients.Hive/3.3/Plugin.cs.frame (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk

Property svn:mergeinfo changed

/branches/1721-RandomForestPersistence (added)	merged: 10321-10322
/branches/Algorithms.GradientDescent (added)	merged: 5516,5518,5520
/branches/Async (added)	merged: 13329,13349,13354-13355,13401,15065,15190,15204,15212,15215-15216,15232,15280-15281,15284,15286
/branches/Benchmarking/sources (added)	merged: 6920,6931-6932,6934,6948,6987,7000,7002,7004
/branches/CloningRefactoring (added)	merged: 4656-4693,4696-4697,4711-4714,4718-4719
/branches/CodeEditor (added)	merged: 11700-11701,11707,11722,11738,11741,11743,11765,11785,11800,11802,11804-11805
/branches/DataAnalysis (added)	merged: 4458-4459,4462,4464
/branches/DataAnalysis Refactoring (added)	merged: 5471,5473-5477,5484,5486-5488,5490-5491,5494-5501,5505-5510,5513-5514,5517,5519,5521,5528-5530,5532,5540,5542,5547-5549,5551-5557,5559,5564-5565,5567,5569-5575,5577-5580,5582,5584-5586,5590,5600-5601,5607,5613,5615-5618,5620,5623-5626,5630,5635,5644,5649-5651,5657-5659,5661-5664,5678,5680-5681,5685-5691,5693-5697,5699,5712-5713,5715-5717,5719-5720,5722,5726-5734,5736-5737,5742,5745-5750,5757-5759,5770-5772,5774-5777,5788,5791-5792,5796,5802-5808
/branches/DataAnalysis SolutionEnsembles (added)	merged: 5815-5816
/branches/DataPreprocessing (added)	merged: 10085,10095,10134,10143-10148,10157-10169,10179-10189,10191-10194,10216-10221,10234-10260,10303-10304,10307-10308,10310-10317,10319-10320,10341-10345,10367,10369-10372,10374,10377,10380-10383,10532-10539,10542,10544,10546-10552,10554-10555,10557-10559,10571-10574,10580-10583,10585-10590,10609-10638,10657-10673,10676,10689-10719,10733-10742,10762-10766,10768-10773,10775-10786,10802-10821,10841-10849,10851-10854,10863,10866-10883,10898-10902,10904-10905,10908-10909,10911,10913-10916,10918,10921-10922,10925,10930-10935,10938-10940,10942-10952,10962,10964-10965,10967,10969-10973,10976-10982,10987,10990-10995,10997-11004,11009,11011,11037-11039,11042-11045,11064,11068,11070,11098
/branches/GP.Grammar.Editor (added)	merged: 6284-6285,6296,6299,6335,6337,6377,6379,6387,6403,6409,6415,6493-6494,6497,6618,6620,6622,6626,6647,6675,6782,6784,6786,6795
/branches/GP.Symbols (TimeLag, Diff, Integral) (added)	merged: 5060
/branches/HLScript (added)	merged: 10331-10332,10358
/branches/HeuristicLab.DatasetRefactor/sources (added)	merged: 11571-11572,11584,11589,11621,11853,12031-12032,12105,12109,12141,12190,12247,12437-12438,12452-12454,12489,12505,12508
/branches/HeuristicLab.Problems.DataAnalysis.Trading (added)	merged: 6123-6128,6131,6136,6138,6861,6937,9176,9213,9743-9745,9796-9799
/branches/HeuristicLab.Problems.Orienteering (added)	merged: 11130,11132-11134,11136,11185-11195,11226,11228,11235-11237,11240,11242,11245,11247,11258,11260-11261,11264-11270,11275-11277,11284,11289,11293,11299,11301,11303-11305,11307,11311-11312,11314,11316,11319-11323,11325,11327-11329,11413,12694,12721
/branches/HiveStatistics/sources (added)	merged: 12440-12441,12467-12469,12477,12484,12515-12516,12522,12525,12551,12558,12560,12562,12584,12586,12689,12691,12761,12765,12767-12769,12773,12775-12778,12780,12789,12843,12852-12853,12857-12858,12861,12866-12867
/branches/LogResidualEvaluator (added)	merged: 10202-10203,10305,10482-10483
/branches/NET40/sources (added)	merged: 5142
/branches/NSGA-II Changes (added)	merged: 12033-12034,12044
/branches/ParallelEngine (added)	merged: 5175-5178,5183,5185,5187-5188
/branches/ProblemInstancesRegressionAndClassification (added)	merged: 7568-7572,7603,7605-7607,7610,7664-7667,7682-7685,7687,7698,7748-7755,7757-7759,7770-7774,7794,7805,7809-7810
/branches/QAPAlgorithms (added)	merged: 6350-6351,6355,6416,6569-6570,6586,6593-6594,6610-6611,6615-6617,6627
/branches/Restructure trunk solution (added)	merged: 6828
/branches/RuntimeOptimizer (added)	merged: 8943,8955-8956,8961,8971,8975,8977,9040-9041,9078
/branches/ScatterSearch (trunk integration) (added)	merged: 7787,7789,7793,7806,7815,7821-7822,7954,8086,8171,8299,8303-8307,8319-8320,8322,8327-8328,8331-8332
/branches/SlaveShutdown (added)	merged: 8944-8945,8949,8951,8953-8954
/branches/SpectralKernelForGaussianProcesses (added)	merged: 10204-10205,10473,10479
/branches/SuccessProgressAnalysis (added)	merged: 5370,5372,5379,5492-5493,5682
/branches/Trunk (added)	merged: 6829,6831-6833,6842-6848,6850,6865
/branches/UnloadJobs (added)	merged: 9168-9170,9173-9174,9183-9184,9187-9188,9193,9201-9202
/branches/VNS (added)	merged: 5594-5595,5603,5609-5610,5622,5642,5735,5738,5751-5752
/branches/crossvalidation-2434 (added)	merged: 12949-12950
/branches/histogram (added)	merged: 5959,5961,5970,5994-5996,5999,6007,6010-6016,6020,6022,6027-6028,6032,6046,6055-6056,6081-6082,6086-6087,6089,6115,6176,6194-6195,6338-6341
/branches/symbreg-factors-2650 (added)	merged: 14232-14233,14237-14243,14248-14249,14251,14259,14266,14276-14277,14330-14331,14339,14351,14399,14401-14403,14421,14449,14497-14499,14501-14502,14534-14535,14539-14542,14554,14560,14589,14591-14592,14615,14693,14701,14715-14717,14719-14720,14751-14756,14758-14766,14812-14815,14823-14825
/stable	merged: 10032-10033,11170,11173,11175,12008-12010,12751-12752,13316-13317,13319,14190
/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
/trunk/sources		reverse-merged: 15383,15388,15390,15395-15398,15400,15402
/branches/Benchmarking	removed
/branches/NET40	removed

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

trunk/HeuristicLab.Clients.Hive/3.3/Plugin.cs.frame

r16205	r16430
37	37	[PluginDependency("HeuristicLab.Hive", "3.3")]
38	38	[PluginDependency("HeuristicLab.MainForm", "3.3")]
	39	[PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
39	40	[PluginDependency("HeuristicLab.Optimization", "3.3")]
40	41	[PluginDependency("HeuristicLab.Persistence", "3.3")]

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

/stable/HeuristicLab.Clients.Hive		reverse-merged: 15587
/trunk/HeuristicLab.Clients.Hive (added)	merged: 16117,16202,16204-16205,16208-16209,16356,16389

Context Navigation

Changeset 16430 for trunk/HeuristicLab.Clients.Hive/3.3/Plugin.cs.frame

Legend:

trunk

trunk/HeuristicLab.Clients.Hive

trunk/HeuristicLab.Clients.Hive/3.3/Plugin.cs.frame

Download in other formats: