Changeset 7383 for branches/HiveHiveEngine/HeuristicLab.Clients.Hive.JobManager/3.3/Views

Timestamp:

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

Author:

ascheibe

Message:

#1745 merged trunk changes into branch

Location:

branches/HiveHiveEngine

Files:

• . (modified) (2 props)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs (modified) (1 diff)

branches/HiveHiveEngine

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
@@ -18 +20 @@
 bin
 protoc.exe
-*.user

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
@@ -18 +20 @@
 bin
 protoc.exe
-*.user

branches/HiveHiveEngine/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs

@@ -25 +25 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
-      this.tabControl = new System.Windows.Forms.TabControl();
+      this.tabControl = new HeuristicLab.MainForm.WindowsForms.DragOverTabControl();
       this.tasksTabPage = new System.Windows.Forms.TabPage();
       this.jobsTreeView = new HeuristicLab.Clients.Hive.Views.HiveTaskItemTreeView();

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
@@ -18 +20 @@
 bin
 protoc.exe
-*.user