Ignore:
Timestamp:
07/07/19 23:40:10 (22 months ago)
Author:
mkommend
Message:

#2520: Merged 16565 - 16579 into stable.

Location:
stable
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Clients.Hive.Slave.App/3.3/HeuristicLab.Clients.Hive.Slave.App-3.3.csproj

    r14193 r17097  
    1111    <RootNamespace>HeuristicLab.Clients.Hive.Slave.App</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Clients.Hive.Slave.App-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <TargetFrameworkProfile>
    1515    </TargetFrameworkProfile>
     
    9393  </PropertyGroup>
    9494  <ItemGroup>
    95     <Reference Include="HeuristicLab.Common-3.3">
    96       <HintPath>..\..\bin\HeuristicLab.Common-3.3.dll</HintPath>
    97       <Private>False</Private>
    98     </Reference>
    99     <Reference Include="HeuristicLab.Core-3.3">
    100       <HintPath>..\..\bin\HeuristicLab.Core-3.3.dll</HintPath>
    101       <Private>False</Private>
    102     </Reference>
    103     <Reference Include="HeuristicLab.Core.Views-3.3">
    104       <HintPath>..\..\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
    105       <Private>False</Private>
    106     </Reference>
     95    <Reference Include="HeuristicLab.Core.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec" />
    10796    <Reference Include="HeuristicLab.MainForm-3.3">
    10897      <HintPath>..\..\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
  • stable/HeuristicLab.Clients.Hive.Slave.App/3.3/HiveSlaveApplication.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • stable/HeuristicLab.Clients.Hive.Slave.App/3.3/MainWindow.Designer.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • stable/HeuristicLab.Clients.Hive.Slave.App/3.3/MainWindow.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • stable/HeuristicLab.Clients.Hive.Slave.App/3.3/Plugin.cs.frame

    r15587 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2929namespace HeuristicLab.Clients.Hive.Slave.App {
    3030  [Plugin("HeuristicLab.Clients.Hive.Slave.App", "3.3.15.$WCREV$")]
    31   [PluginFile("HeuristicLab.Clients.Hive.Slave.App-3.3.dll", PluginFileType.Assembly)]     
    32   [PluginDependency("HeuristicLab.Clients.Hive.SlaveCore", "3.3")] 
    33   [PluginDependency("HeuristicLab.Clients.Hive.Slave.Views", "3.3")] 
    34   [PluginDependency("HeuristicLab.Core", "3.3")] 
    35   [PluginDependency("HeuristicLab.Common", "3.3")] 
     31  [PluginFile("HeuristicLab.Clients.Hive.Slave.App-3.3.dll", PluginFileType.Assembly)]
     32  [PluginDependency("HeuristicLab.Clients.Hive.SlaveCore", "3.3")]
     33  [PluginDependency("HeuristicLab.Clients.Hive.Slave.Views", "3.3")]
    3634  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
    3735  [PluginDependency("HeuristicLab.MainForm", "3.3")]
  • stable/HeuristicLab.Clients.Hive.Slave.App/3.3/Properties/AssemblyInfo.cs.frame

    r15587 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
Note: See TracChangeset for help on using the changeset viewer.