Changeset 13294 for stable/HeuristicLab.Selection

Timestamp:

11/19/15 13:31:58 (9 years ago)

Author:

gkronber

Message:

#2478: merged r13164,13165 from trunk to stable (resolving conflict in solution file)

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Selection/3.3/EvolutionStrategyOffspringSelector.cs (copied) (copied from trunk/sources/HeuristicLab.Selection/3.3/EvolutionStrategyOffspringSelector.cs)
• HeuristicLab.Selection/3.3/HeuristicLab.Selection-3.3.csproj (modified) (1 diff)

stable/HeuristicLab.Selection/3.3/HeuristicLab.Selection-3.3.csproj

@@ -119 +119 @@
     <Compile Include="ConditionalSelector.cs" />
     <Compile Include="CrowdedTournamentSelector.cs" />
+    <Compile Include="EvolutionStrategyOffspringSelector.cs" />
     <Compile Include="GeneralizedRankSelector.cs" />
     <Compile Include="LeftSelector.cs" />