Context Navigation

Views

Timestamp:

10/18/18 16:16:31 (6 years ago)

Author:

gkronber

Message:

#2915: merged changes in the trunk up to current HEAD (r15951:16232) into the branch

Location:

branches/2915-AbsoluteSymbol

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/2916_IndexedDataTableSerialization (added)	merged: 15918
/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: 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
/trunk/sources (added)	merged: 15589-15590

-                      r15583
+                      r16240
       downloadCharacteristicsButton.Image = VSImageLibrary.Refresh;
       uploadCharacteristicsButton.Text = string.Empty;
       uploadCharacteristicsButton.Image = VSImageLibrary.PublishToWeb;
+      uploadCharacteristicsButton.Image = VSImageLibrary.Save;
       refreshSolutionsButton.Text = string.Empty;
       refreshSolutionsButton.Image = VSImageLibrary.Refresh;
       uploadSolutionsButton.Text = string.Empty;
       uploadSolutionsButton.Image = VSImageLibrary.PublishToWeb;
+      uploadSolutionsButton.Image = VSImageLibrary.Save;
+    }

r15583	r16240
51	51	// storeButton
52	52	//
53		this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.~~PublishToWeb~~;
	53	this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
54	54	this.storeButton.Location = new System.Drawing.Point(0, 0);
55	55	this.storeButton.Name = "storeButton";

r15583	r16240
41	41	refreshButton.Image = VSImageLibrary.Refresh;
42	42	uploadButton.Text = string.Empty;
43		uploadButton.Image = VSImageLibrary.~~PublishToWeb~~;
	43	uploadButton.Image = VSImageLibrary.Save;
44	44	}
45	45

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

/branches/2839_HiveProjectManagement/HeuristicLab.Clients.OKB.Views (added)	merged: 15953,16044,16057
/trunk/HeuristicLab.Clients.OKB.Views (added)	merged: 16024-16025,16032-16033,16117