Changeset 14498 for branches/symbreg-factors-2650/HeuristicLab.Optimization/3.3

Timestamp:

12/17/16 15:42:19 (8 years ago)

Author:

gkronber

Message:

#2650: merged r14457:14494 from trunk to branch (resolving conflicts)

Location:

branches/symbreg-factors-2650

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimization (modified) (1 prop)
• HeuristicLab.Optimization/3.3/Termination/MultiTerminator.cs (modified) (1 diff)

branches/symbreg-factors-2650/HeuristicLab.Optimization/3.3/Termination/MultiTerminator.cs

@@ -38 +38 @@
       get { return HeuristicLab.Common.Resources.VSImageLibrary.FlagRed; }
     }
-
+    
     public ILookupParameter<BoolValue> TerminateParameter {
       get { return (ILookupParameter<BoolValue>)Parameters["Terminate"]; }