Context Navigation

HiveTaskView.designer.cs

Timestamp:

12/15/18 12:07:16 (6 years ago)

Author:

gkronber

Message:

#2925 merged changes r15972:16382 from trunk to branch

Location:

branches/2925_AutoDiffForDynamicalModels

Files:

Property svn:mergeinfo changed

/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/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/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
/stable (added)	merged: 15587-15588
/trunk (added)	merged: 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
/trunk/sources (added)	merged: 15589-15590

Property svn:mergeinfo changed

/branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Views (added)	merged: 15913,15920,15922,15933,16044,16057,16094,16116
/branches/2915-AbsoluteSymbol/HeuristicLab.Clients.Hive.Views (added)	merged: 16240
/trunk/HeuristicLab.Clients.Hive.Views (added)	merged: 16117,16356

-                      r15583
+                      r16386
             "2",
             "3",
+            "4"});
+            "4",
+            "6",
+            "8",
+            "10",
+            "12"});
       this.coresNeededComboBox.Location = new System.Drawing.Point(134, 13);
       this.coresNeededComboBox.Name = "coresNeededComboBox";
       this.coresNeededComboBox.Size = new System.Drawing.Size(134, 21);
       this.coresNeededComboBox.TabIndex = 41;
+      this.coresNeededComboBox.SelectedIndexChanged += new System.EventHandler(this.coresNeededComboBox_SelectedIndexChanged);
       //
       // memoryNeededLabel

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