Context Navigation

← Previous Change
Next Change →

Changeset 12031 for branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.ScheduleEncoding.Views/3.3

Timestamp:

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

Author:

bburlacu

Message:

#2276: Merged trunk changes.

Location:

branches/HeuristicLab.DatasetRefactor/sources

Files:

: 13 edited

. (modified) (1 prop)
HeuristicLab.Encodings.ScheduleEncoding.Views/3.3/GanttChart.Designer.cs (modified) (1 diff)
HeuristicLab.Encodings.ScheduleEncoding.Views/3.3/GanttChart.cs (modified) (1 diff)
HeuristicLab.Encodings.ScheduleEncoding.Views/3.3/HeuristicLab.Encodings.ScheduleEncoding.Views-3.3.csproj (modified) (7 diffs)
HeuristicLab.Encodings.ScheduleEncoding.Views/3.3/JobDataPoint.cs (modified) (1 diff)
HeuristicLab.Encodings.ScheduleEncoding.Views/3.3/JobView.Designer.cs (modified) (1 diff)
HeuristicLab.Encodings.ScheduleEncoding.Views/3.3/JobView.cs (modified) (1 diff)
HeuristicLab.Encodings.ScheduleEncoding.Views/3.3/Plugin.cs.frame (modified) (2 diffs)
HeuristicLab.Encodings.ScheduleEncoding.Views/3.3/Properties/AssemblyInfo.cs.frame (modified) (2 diffs)
HeuristicLab.Encodings.ScheduleEncoding.Views/3.3/ScheduleView.Designer.cs (modified) (1 diff)
HeuristicLab.Encodings.ScheduleEncoding.Views/3.3/ScheduleView.cs (modified) (1 diff)
HeuristicLab.Encodings.ScheduleEncoding.Views/3.3/TaskView.Designer.cs (modified) (1 diff)
HeuristicLab.Encodings.ScheduleEncoding.Views/3.3/TaskView.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.Encodings.ScheduleEncoding.Views/3.3/GanttChart.Designer.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.Encodings.ScheduleEncoding.Views/3.3/GanttChart.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.Encodings.ScheduleEncoding.Views/3.3/HeuristicLab.Encodings.ScheduleEncoding.Views-3.3.csproj

-                      r8886
+                      r12031
     <RootNamespace>HeuristicLab.Encodings.ScheduleEncoding.Views</RootNamespace>
     <AssemblyName>HeuristicLab.Encodings.ScheduleEncoding.Views-3.3</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
 …
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
 …
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
 …
     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
 …
     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
 …
     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
 …
     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.ScheduleEncoding.Views/3.3/JobDataPoint.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.Encodings.ScheduleEncoding.Views/3.3/JobView.Designer.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.Encodings.ScheduleEncoding.Views/3.3/JobView.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.Encodings.ScheduleEncoding.Views/3.3/Plugin.cs.frame

-                      r11174
+                      r12031
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 namespace HeuristicLab.Encodings.ScheduleEncoding.Views {
   [Plugin("HeuristicLab.Encodings.ScheduleEncoding.Views", "3.3.10.$WCREV$")]
+  [Plugin("HeuristicLab.Encodings.ScheduleEncoding.Views", "3.3.11.$WCREV$")]
   [PluginFile("HeuristicLab.Encodings.ScheduleEncoding.Views-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.ScheduleEncoding.Views/3.3/Properties/AssemblyInfo.cs.frame

-                      r11174
+                      r12031
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
 [assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2015 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 …
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
 [assembly: AssemblyFileVersion("3.3.10.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.11.$WCREV$")]

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.ScheduleEncoding.Views/3.3/ScheduleView.Designer.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.Encodings.ScheduleEncoding.Views/3.3/ScheduleView.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.Encodings.ScheduleEncoding.Views/3.3/TaskView.Designer.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.Encodings.ScheduleEncoding.Views/3.3/TaskView.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.

Context Navigation

Changeset 12031 for branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.ScheduleEncoding.Views/3.3

Legend:

Download in other formats: