[Flexiblesusy-commits] [FlexibleSUSY/FlexibleSUSY] 6543c5: reorder ChangeLog items

[GitHub]

  Branch: refs/heads/feature-2.0-thread_pool
  Home:   https://github.com/FlexibleSUSY/FlexibleSUSY
  Commit: 6543c57e21c9c937ec6c44c456fd6b3982c94b16
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/6543c57e21c9c937ec6c44c456fd6b3982c94b16
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2016-12-07 (Wed, 07 Dec 2016)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  reorder ChangeLog items


  Commit: f8ab90306117e868d776fb821f06ae284503f0b1
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/f8ab90306117e868d776fb821f06ae284503f0b1
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2016-12-07 (Wed, 07 Dec 2016)

  Changed paths:
    M src/global_thread_pool.cpp
    M src/thread_pool.hpp

  Log Message:
  -----------
  use hardware_concurrency() by default for number of threads


  Commit: 29fbac8f46e82b336237760bfa77cf022b243d5b
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/29fbac8f46e82b336237760bfa77cf022b243d5b
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2016-12-07 (Wed, 07 Dec 2016)

  Changed paths:
    M src/thread_pool.hpp

  Log Message:
  -----------
  undef B0 which is defined in termios.h

which is included from boost/asio.hpp


  Commit: 87652578d756447c504d5d957b00860016ed379d
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/87652578d756447c504d5d957b00860016ed379d
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2016-12-07 (Wed, 07 Dec 2016)

  Changed paths:
    M models/SoftsusyNMSSM/run_softpoint.cpp
    M src/def.cpp
    M src/def.h

  Log Message:
  -----------
  always activate 3L RGEs in Softsusy


  Commit: 4a0883fd08a6c0e246f9cadd59f3fa937461b31c
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/4a0883fd08a6c0e246f9cadd59f3fa937461b31c
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2016-12-07 (Wed, 07 Dec 2016)

  Changed paths:
    M templates/mass_eigenstates.cpp.in

  Log Message:
  -----------
  use auto to deduce type of this


  Commit: 2e62e0cd9680db12fbba4865cd74c87904b8175f
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/2e62e0cd9680db12fbba4865cd74c87904b8175f
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2016-12-07 (Wed, 07 Dec 2016)

  Changed paths:
    M ChangeLog
    M templates/mass_eigenstates.cpp.in

  Log Message:
  -----------
  Merge remote-tracking branch 'organization/development' into feature-2.0


  Commit: 96f02a6c77ebfdc93b9ffe96a92a42199860a42c
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/96f02a6c77ebfdc93b9ffe96a92a42199860a42c
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2016-12-07 (Wed, 07 Dec 2016)

  Changed paths:
    M meta/BetaFunction.m
    M meta/FlexibleSUSY.m

  Log Message:
  -----------
  remove unused parameter


  Commit: a08b13ca27f21513f930b9b4ea2c3d90dcaf1821
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/a08b13ca27f21513f930b9b4ea2c3d90dcaf1821
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2016-12-07 (Wed, 07 Dec 2016)

  Changed paths:
    M meta/BetaFunction.m
    M meta/FlexibleSUSY.m

  Log Message:
  -----------
  Merge remote-tracking branch 'organization/development' into feature-2.0

Conflicts:
	meta/BetaFunction.m


  Commit: 5f5e18d7e0a4268b7e4fd614d6801483c6cbf69a
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/5f5e18d7e0a4268b7e4fd614d6801483c6cbf69a
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2016-12-07 (Wed, 07 Dec 2016)

  Changed paths:
    M ChangeLog
    M meta/BetaFunction.m
    M meta/FlexibleSUSY.m
    M templates/mass_eigenstates.cpp.in

  Log Message:
  -----------
  Merge branch 'feature-2.0' into feature-2.0-thread_pool

Conflicts:
	meta/BetaFunction.m


Compare: https://github.com/FlexibleSUSY/FlexibleSUSY/compare/bafac7c35bd4...5f5e18d7e0a4