Context Navigation

HeuristicLab.Clients.Hive.Slave.ConsoleClient

Timestamp:

07/14/14 10:28:20 (10 years ago)

Author:

pfleck

Message:

#2208 merged trunk and updated version info

Location:

branches/HeuristicLab.Problems.Orienteering

Files:

branches/HeuristicLab.Problems.Orienteering
- Property svn:mergeinfo changed
  /stable merged: 11170,11173,11175
  /trunk/sources merged: 11153,11156,11161,11163,11171-11172,11174,11176

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

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

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

/stable	merged: 11170,11173,11175
/trunk/sources	merged: 11153,11156,11161,11163,11171-11172,11174,11176