Context Navigation

Changeset 12843 for branches/HiveStatistics/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4

Timestamp:

08/11/15 10:11:47 (9 years ago)

Author:

ascheibe

Message:

#2388 merged trunk into branch

Location:

branches/HiveStatistics/sources

Files:

Property svn:ignore

Property svn:mergeinfo changed

/branches/HeuristicLab.Problems.Orienteering (added)	merged: 11130,11132-11134,11136,11185-11195,11226,11228,11235-11237,11240,11242,11245,11247,11258,11260-11261,11264-11270,11275-11277,11284,11289,11293,11299,11301,11303-11305,11307,11311-11312,11314,11316,11319-11323,11325,11327-11329,11413,12694,12721
/stable	merged: 12751-12752
/trunk/sources	merged: 12690,12692,12695,12700-12701,12710,12714-12716,12720,12722,12724,12728,12731,12743-12744,12753,12755,12770,12772,12787,12790-12795,12797-12798,12801,12810-12812,12816-12817,12819,12835-12837,12839

Property svn:mergeinfo changed

/branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views (added)	merged: 11185,12694
/stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views	merged: 12751
/trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views	merged: 12722,12753

r12012	r12843
26	26
27	27	namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views {
28		[Plugin("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views","Provides views for the symbolic expression tree encoding.", "3.4.7.$WCREV$")]
	28	[Plugin("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views","Provides views for the symbolic expression tree encoding.", "3.4.8.$WCREV$")]
29	29	[PluginFile("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.dll", PluginFileType.Assembly)]
30	30	[PluginDependency("HeuristicLab.Collections", "3.3")]

r12012	r12843
45	45
46	46	[assembly: AssemblyVersion("3.4.0.0")]
47		[assembly: AssemblyFileVersion("3.4.7.$WCREV$")]
	47	[assembly: AssemblyFileVersion("3.4.8.$WCREV$")]

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