Context Navigation

Changeset 9539 for branches/HivePerformance/sources/HeuristicLab.Persistence.GUI/3.3

Timestamp:

05/27/13 12:44:27 (11 years ago)

Author:

ascheibe

Message:

#2030 merged changes of trunk into branch

Location:

branches/HivePerformance/sources

Files:

branches/HivePerformance/sources
- Property svn:mergeinfo changed
  /trunk/sources merged: 9445,9447-9459,9462-9466,9471-9472,9474,9476-9479,9493,9496,9498,9504-9506,9515-9517,9520-9521,9523,9530-9531,9534-9537

r7259	r9539
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

r7967	r9539
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

r7259	r9539
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

r8818	r9539
4	4	namespace HeuristicLab.Persistence.GUI {
5	5
6		[Plugin("HeuristicLab.Persistence.GUI", "3.3.7.$WCREV$")]
	6	[Plugin("HeuristicLab.Persistence.GUI", "3.3.8.$WCREV$")]
7	7	[PluginFile("HeuristicLab.Persistence.GUI-3.3.dll", PluginFileType.Assembly)]
8	8	[PluginDependency("HeuristicLab.Common.Resources", "3.3")]

-                      r8246
+                      r9539
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
 [assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2013 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 …
 //
 [assembly: AssemblyVersion("3.3.0.0")]
 [assembly: AssemblyFileVersion("3.3.7.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.8.$WCREV$")]

r7259	r9539
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2013 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.