Context Navigation

← Previous Change
Next Change →

Views

Timestamp:

07/07/19 23:40:10 (6 years ago)

Author:

mkommend

Message:

#2520: Merged 16565 - 16579 into stable.

Location:

stable

Files:

: 16 edited

. (modified) (1 prop)
HeuristicLab.Clients.Hive.JobManager (modified) (1 prop)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionListView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionListView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs (modified) (2 diffs)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.cs (modified) (2 diffs)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs (modified) (2 diffs)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

stable

Property svn:mergeinfo changed

/branches/2520_PersistenceReintegration (added)	merged: 16451-16454,16462,16465-16468,16470-16472,16474,16476-16477,16479-16487,16529-16530,16539,16551-16555,16558-16559,16562-16564
/trunk	merged: 16565,16568-16569,16571-16572,16578-16579

stable/HeuristicLab.Clients.Hive.JobManager

Property svn:mergeinfo changed

/branches/2520_PersistenceReintegration/HeuristicLab.Clients.Hive.JobManager (added)	merged: 16452-16454,16462,16529,16539,16558-16559
/trunk/HeuristicLab.Clients.Hive.JobManager	merged: 16565,16568

stable/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.Designer.cs

r17059	r17097
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

stable/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs

r15584	r17097
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

stable/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionListView.Designer.cs

r15584	r17097
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

stable/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionListView.cs

r15584	r17097
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

stable/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionView.Designer.cs

r15584	r17097
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

stable/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionView.cs

r15584	r17097
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

stable/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.Designer.cs

r17060	r17097
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

stable/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs

-                      r17060
+                      r17097
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using System.Linq;
 using System.Windows.Forms;
-using HeuristicLab.Collections;
-using HeuristicLab.Common;
 using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;

stable/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.Designer.cs

r17059	r17097
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

stable/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.cs

-                      r17064
+                      r17097
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using HeuristicLab.Clients.Hive.Views;
 using HeuristicLab.MainForm;
-using HeuristicLab.Core;
 namespace HeuristicLab.Clients.Hive.JobManager.Views {

stable/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.Designer.cs

r15584	r17097
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

stable/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs

-                      r17062
+                      r17097
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;

stable/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs

r17059	r17097
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

stable/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

r17062	r17097
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

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

Context Navigation

Changeset 17097 for stable/HeuristicLab.Clients.Hive.JobManager/3.3/Views

Legend:

Download in other formats: