Context Navigation

HeuristicLab.Clients.Hive.Slave.ConsoleClient

Timestamp:

11/20/18 11:54:35 (6 years ago)

Author:

pfleck

Message:

#2845 Merged trunk changes before source move into branch

Location:

branches/2845_EnhancedProgress

Files:

Property svn:mergeinfo changed

/stable	merged: 15587-15588
/trunk/sources (added)	merged: 15419,15427,15447-15448,15452,15461,15464,15478,15480-15481,15483,15486,15498-15499,15502,15505,15513,15517-15518,15532,15534,15545,15548,15551,15556,15560,15566,15581,15583,15589-15591,15594,15596,15598,15607,15610-15611,15619,15621-15623,15626,15637-15638,15645,15665,15667,15672-15674

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

-                      r14195
+                      r16307
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
 [assembly: AssemblyCopyright("(c) 2002-2016 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2018 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 …
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
 [assembly: AssemblyFileVersion("3.3.14.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.15.$WCREV$")]

r14185	r16307
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 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.