Context Navigation

HeuristicLab.Clients.Hive.JobManager

Timestamp:

01/20/12 13:52:51 (13 years ago)

Author:

ascheibe

Message:

#1745 merged trunk changes into branch

Location:

branches/HiveHiveEngine

Files:

Property svn:ignore

-                      old
+                      new
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 …
 bin
 protoc.exe
-*.user

Property svn:mergeinfo changed
/trunk/sources (added) merged: 7294-7295,7297,7304-7306,7318,7327,7333,7335,7341-7342,7351-7353,7369-7370

r7259	r7383
21	21
22	22	using System.Collections.Generic;
	23	using System.Windows.Forms;
23	24	using HeuristicLab.Clients.Hive;
24	25	using HeuristicLab.MainForm;
…	…
38	39	get { return 10000; }
39	40	}
	41	public override Keys ShortCutKeys {
	42	get { return Keys.Control \| Keys.H; }
	43	}
40	44	}
41	45	}

r7257	r7383
25	25	private void InitializeComponent() {
26	26	this.components = new System.ComponentModel.Container();
27		this.tabControl = new ~~System.Windows.Forms.~~TabControl();
	27	this.tabControl = new HeuristicLab.MainForm.WindowsForms.DragOverTabControl();
28	28	this.tasksTabPage = new System.Windows.Forms.TabPage();
29	29	this.jobsTreeView = new HeuristicLab.Clients.Hive.Views.HiveTaskItemTreeView();

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