- Timestamp:
- 01/04/12 16:45:02 (13 years ago)
- Location:
- branches/HeuristicLab.Hive.Azure
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Hive.Azure
- Property svn:mergeinfo changed
/trunk/sources merged: 7195-7201,7209,7214,7216-7230,7233-7239,7241,7243-7252,7254,7256-7261,7265-7266
- Property svn:mergeinfo changed
-
branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Problems/HeuristicOptimizationProblem.cs
r5954 r7270 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 1Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Problems/MultiObjectiveHeuristicOptimizationProblem.cs
r5954 r7270 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 1Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Problems/Problem.cs
r6938 r7270 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 1Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 39 39 } 40 40 41 public override ImageItemImage {41 public static new Image StaticItemImage { 42 42 get { return HeuristicLab.Common.Resources.VSImageLibrary.Type; } 43 43 } -
branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (added) merged: 7259
r6866 r7270 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 1Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. - Property svn:mergeinfo changed
-
branches/HeuristicLab.Hive.Azure/HeuristicLab.Optimization/3.3/Problems/UserDefinedProblem.cs
r5954 r7270 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 1Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 43 43 public string Filename { get; set; } 44 44 45 public override ImageItemImage {45 public static new Image StaticItemImage { 46 46 get { return HeuristicLab.Common.Resources.VSImageLibrary.Type; } 47 47 } … … 263 263 #endregion 264 264 265 public override ImageItemImage {265 public static new Image StaticItemImage { 266 266 get { return HeuristicLab.Common.Resources.VSImageLibrary.Method; } 267 267 }
Note: See TracChangeset
for help on using the changeset viewer.