[Flexiblesusy-commits] [FlexibleSUSY/FlexibleSUSY] bed183: update ChangeLog

[GitHub]

  Branch: refs/heads/feature-SMtower
  Home:   https://github.com/FlexibleSUSY/FlexibleSUSY
  Commit: bed183b4fbdaaa85160f06f927cc9f014a23bd77
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/bed183b4fbdaaa85160f06f927cc9f014a23bd77
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2016-08-17 (Wed, 17 Aug 2016)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  update ChangeLog


  Commit: e00b8d16843a19ea972e88f664adc9273e613dd2
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/e00b8d16843a19ea972e88f664adc9273e613dd2
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2016-08-17 (Wed, 17 Aug 2016)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Revert "update ChangeLog"

This reverts commit bed183b4fbdaaa85160f06f927cc9f014a23bd77.


  Commit: 26edf5ceac3399669f94975ab7fa28915c7b04e7
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/26edf5ceac3399669f94975ab7fa28915c7b04e7
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2016-08-17 (Wed, 17 Aug 2016)

  Changed paths:
    M meta/LoopMasses.m
    M src/standard_model.cpp
    M templates/mass_eigenstates.cpp.in

  Log Message:
  -----------
  Revert "use std::async instead of std::thread"

This reverts commit 1cc1880123061fb38b38e631c43ead8dff150ddb.


  Commit: 91054d35e8b45c1412ce7d16131bcc104784fcae
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/91054d35e8b45c1412ce7d16131bcc104784fcae
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2016-08-17 (Wed, 17 Aug 2016)

  Changed paths:
    M meta/FlexibleEFTHiggsMatching.m
    M meta/LoopMasses.m

  Log Message:
  -----------
  Revert "remove unused thread joining"

This reverts commit 06cf30dc7fb47dff447efda0c91fb32a17db7f0f.


  Commit: ecc4ae7c521647bf5f1943eec037b94825dd9467
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/ecc4ae7c521647bf5f1943eec037b94825dd9467
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2016-08-17 (Wed, 17 Aug 2016)

  Changed paths:
    M meta/LoopMasses.m
    M src/standard_model.cpp
    M templates/mass_eigenstates.cpp.in

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/development' into feature-SMtower

Conflicts:
	meta/LoopMasses.m


Compare: https://github.com/FlexibleSUSY/FlexibleSUSY/compare/06cf30dc7fb4...ecc4ae7c5216