Context Navigation

HeuristicLab.DebugEngine.Views

Timestamp:

11/20/18 13:52:40 (6 years ago)

Author:

pfleck

Message:

#2845 reverted the last merge (r16307) because some revisions were missing

Location:

branches/2845_EnhancedProgress

Files:

branches/2845_EnhancedProgress
- Property svn:mergeinfo changed
  /stable reverse-merged: 15587-15588
  /trunk/sources removed

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

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

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

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

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

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

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

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

-                      r16307
+                      r16308
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 namespace HeuristicLab.DebugEngine.Views {
   [Plugin("HeuristicLab.DebugEngine.Views", "3.3.15.$WCREV$")]
+  [Plugin("HeuristicLab.DebugEngine.Views", "3.3.14.$WCREV$")]
   [PluginFile("HeuristicLab.DebugEngine.Views-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

-                      r16307
+                      r16308
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
 [assembly: AssemblyCopyright("(c) 2002-2018 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2016 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 …
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
 [assembly: AssemblyFileVersion("3.3.15.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.14.$WCREV$")]

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

/stable		reverse-merged: 15587-15588
/trunk/sources	removed