Context Navigation

← Previous Change
Next Change →

Core

Timestamp:

02/18/15 10:54:32 (10 years ago)

Author:

bburlacu

Message:

#2276: Merged trunk changes.

Location:

branches/HeuristicLab.DatasetRefactor/sources

Files:

: 23 edited

. (modified) (1 prop)
HeuristicLab.Persistence (modified) (1 prop)
HeuristicLab.Persistence/3.3/Core/Configuration.cs (modified) (1 diff)
HeuristicLab.Persistence/3.3/Core/ConfigurationService.cs (modified) (1 diff)
HeuristicLab.Persistence/3.3/Core/DataMemberAccessor.cs (modified) (1 diff)
HeuristicLab.Persistence/3.3/Core/Deserializer.cs (modified) (1 diff)
HeuristicLab.Persistence/3.3/Core/FormatBase.cs (modified) (1 diff)
HeuristicLab.Persistence/3.3/Core/GeneratorBase.cs (modified) (1 diff)
HeuristicLab.Persistence/3.3/Core/PersistenceException.cs (modified) (1 diff)
HeuristicLab.Persistence/3.3/Core/PrimitiveSerializerBase.cs (modified) (1 diff)
HeuristicLab.Persistence/3.3/Core/Serializer.cs (modified) (1 diff)
HeuristicLab.Persistence/3.3/Core/Tag.cs (modified) (1 diff)
HeuristicLab.Persistence/3.3/Core/Tokens/BeginToken.cs (modified) (1 diff)
HeuristicLab.Persistence/3.3/Core/Tokens/CompositeTokenBase.cs (modified) (1 diff)
HeuristicLab.Persistence/3.3/Core/Tokens/EndToken.cs (modified) (1 diff)
HeuristicLab.Persistence/3.3/Core/Tokens/MetaInfoBeginToken.cs (modified) (1 diff)
HeuristicLab.Persistence/3.3/Core/Tokens/MetaInfoEndToken.cs (modified) (1 diff)
HeuristicLab.Persistence/3.3/Core/Tokens/NullReferenceToken.cs (modified) (1 diff)
HeuristicLab.Persistence/3.3/Core/Tokens/PrimitiveToken.cs (modified) (1 diff)
HeuristicLab.Persistence/3.3/Core/Tokens/ReferenceToken.cs (modified) (1 diff)
HeuristicLab.Persistence/3.3/Core/Tokens/SerializationTokenBase.cs (modified) (1 diff)
HeuristicLab.Persistence/3.3/Core/Tokens/TypeToken.cs (modified) (1 diff)
HeuristicLab.Persistence/3.3/Core/TypeMapping.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/HeuristicLab.DatasetRefactor/sources

Property svn:mergeinfo changed

/branches/CodeEditor (added)	merged: 11700-11701,11707,11722,11738,11741,11743,11765,11785,11800,11802,11804-11805
/stable	merged: 12008-12010
/trunk/sources (added)	merged: 11581,11592,11596-11597,11599-11600,11605,11608,11610,11615-11616,11618,11623,11631,11634,11650-11652,11657,11675,11679-11680,11703-11705,11715,11717,11721,11723-11725,11734-11736,11756-11758,11762-11763,11766,11771-11772,11781-11782,11784,11787-11790,11794,11807,11809-11811,11815-11816,11818-11819,11822,11825-11831,11833-11837,11839-11840,11854,11856,11877-11879,11882,11890,11909,11912-11916,11918,11921,11930,11933-11934,11936,11938-11939,11942,11945,11948,11950-11951,11955-11956,11958-11961,11963,11967,11970-11971,11978,11982-11984,11987-11994,11996,11998-12004,12012,12015-12016,12019,12022

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence
- Property svn:mergeinfo changed
  /stable/HeuristicLab.Persistence merged: 12008-12009
  /trunk/sources/HeuristicLab.Persistence (added) merged: 11623,11650,12012

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence/3.3/Core/Configuration.cs

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

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence/3.3/Core/ConfigurationService.cs

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

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence/3.3/Core/DataMemberAccessor.cs

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

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence/3.3/Core/Deserializer.cs

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

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence/3.3/Core/FormatBase.cs

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

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence/3.3/Core/GeneratorBase.cs

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

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence/3.3/Core/PersistenceException.cs

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

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence/3.3/Core/PrimitiveSerializerBase.cs

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

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence/3.3/Core/Serializer.cs

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

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence/3.3/Core/Tag.cs

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

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence/3.3/Core/Tokens/BeginToken.cs

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

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence/3.3/Core/Tokens/CompositeTokenBase.cs

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

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence/3.3/Core/Tokens/EndToken.cs

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

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence/3.3/Core/Tokens/MetaInfoBeginToken.cs

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

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence/3.3/Core/Tokens/MetaInfoEndToken.cs

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

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence/3.3/Core/Tokens/NullReferenceToken.cs

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

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence/3.3/Core/Tokens/PrimitiveToken.cs

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

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence/3.3/Core/Tokens/ReferenceToken.cs

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

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence/3.3/Core/Tokens/SerializationTokenBase.cs

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

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence/3.3/Core/Tokens/TypeToken.cs

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

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence/3.3/Core/TypeMapping.cs

r11171	r12031
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2015 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/HeuristicLab.Persistence	merged: 12008-12009
/trunk/sources/HeuristicLab.Persistence (added)	merged: 11623,11650,12012

Context Navigation

Changeset 12031 for branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence/3.3/Core

Legend:

Download in other formats: