[Flexiblesusy-commits] [FlexibleSUSY/FlexibleSUSY] 84f1d6: account for non-SVD cases

[GitHub]

  Branch: refs/heads/feature-sqlite
  Home:   https://github.com/FlexibleSUSY/FlexibleSUSY
  Commit: 84f1d64d0eda1a57679763c9a93fd94257d46f0d
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/84f1d64d0eda1a57679763c9a93fd94257d46f0d
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-10-28 (Wed, 28 Oct 2015)

  Changed paths:
    M meta/TreeMasses.m

  Log Message:
  -----------
  account for non-SVD cases


  Commit: d553af867e787c1b68e0af177e0bfa6795281ad0
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/d553af867e787c1b68e0af177e0bfa6795281ad0
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-10-29 (Thu, 29 Oct 2015)

  Changed paths:
    M src/command_line_options.cpp
    M templates/run.cpp.in

  Log Message:
  -----------
  Change: print SLHA output to stdout only if slha-output-file is -


  Commit: 7ce1fc89be0122ca21cd765843542596ac16456c
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/7ce1fc89be0122ca21cd765843542596ac16456c
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-10-29 (Thu, 29 Oct 2015)

  Changed paths:
    M ChangeLog

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


  Commit: c3ea91fc69cc7904da183bd93ad9d63807a65c0f
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/c3ea91fc69cc7904da183bd93ad9d63807a65c0f
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-10-29 (Thu, 29 Oct 2015)

  Changed paths:
    M ChangeLog
    M src/command_line_options.cpp
    M templates/run.cpp.in

  Log Message:
  -----------
  Merge branch 'development' into feature-sqlite

Conflicts:
	src/command_line_options.cpp
	templates/run.cpp.in


Compare: https://github.com/FlexibleSUSY/FlexibleSUSY/compare/e639e1d68475...c3ea91fc69cc