Context Navigation

Changeset 6379 for branches

Timestamp:

06/07/11 13:09:47 (13 years ago)

Author:

mkommend

Message:

#1479: Merged trunk changes.

Location:

branches/GP.Grammar.Editor

Files:

Property svn:mergeinfo changed

/branches/histogram (added)	merged: 5959,5961,5970,5994-5996,5999,6007,6010-6016,6020,6022,6027-6028,6032,6046,6055-6056,6081-6082,6086-6087,6089,6115,6176,6194-6195,6338-6341
/trunk/sources (added)	merged: 6291,6298,6302,6342,6344,6352-6353,6356,6363,6365,6375-6376,6378

Property svn:mergeinfo changed

/branches/histogram/HeuristicLab.Analysis (added)	merged: 5961,5994-5995,6010-6014,6020,6022,6032,6046,6055,6115,6195,6338,6340
/trunk/sources/HeuristicLab.Analysis (added)	merged: 6342

Property svn:mergeinfo changed

/branches/histogram/HeuristicLab.Encodings.PermutationEncoding (added)	merged: 6011,6022,6032,6046,6055-6056,6086,6195,6340
/trunk/sources/HeuristicLab.Encodings.PermutationEncoding (added)	merged: 6342

r6237	r6379
42	42	}
43	43
	44	[Storable]
44	45	private ISymbolicExpressionGrammar grammar;
45	46	public SymbolicExpressionTreeGrammar(ISymbolicExpressionGrammar grammar)

Property svn:mergeinfo changed

/branches/histogram/HeuristicLab.Problems.VehicleRouting.Views (added)	merged: 6011,6022,6032,6046,6055,6195,6340
/trunk/sources/HeuristicLab.Problems.VehicleRouting.Views (added)	merged: 6342

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

/branches/histogram/HeuristicLab.Persistence (added)	merged: 6011,6020,6022,6027-6028,6032,6046,6055,6195,6340
/trunk/sources/HeuristicLab.Persistence (added)	merged: 6342,6356

/branches/histogram/HeuristicLab.Problems.DataAnalysis (added)	merged: 6011,6022,6032,6046,6055,6195,6340
/trunk/sources/HeuristicLab.Problems.DataAnalysis (added)	merged: 6302,6342