[Flexiblesusy-commits] [FlexibleSUSY/FlexibleSUSY] b625a3: move check of non-perturbative parameters into sep...

[GitHub]

  Branch: refs/heads/feature-semianalytic-solver
  Home:   https://github.com/FlexibleSUSY/FlexibleSUSY
  Commit: b625a3bd6762d0730929987542028180a0a59d8b
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/b625a3bd6762d0730929987542028180a0a59d8b
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-07-12 (Sun, 12 Jul 2015)

  Changed paths:
    M meta/Constraint.m
    M meta/FlexibleSUSY.m
    M templates/two_scale_high_scale_constraint.cpp.in
    M templates/two_scale_high_scale_constraint.hpp.in

  Log Message:
  -----------
  move check of non-perturbative parameters into separate function


  Commit: a2e7f94bf322eaa0dd64a5f0904b790f303d2dde
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/a2e7f94bf322eaa0dd64a5f0904b790f303d2dde
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-07-12 (Sun, 12 Jul 2015)

  Changed paths:
    M meta/Constraint.m
    M meta/FlexibleSUSY.m
    M templates/two_scale_high_scale_constraint.cpp.in
    M templates/two_scale_high_scale_constraint.hpp.in

  Log Message:
  -----------
  Merge branch 'development' into feature-semianalytic-solver

Conflicts:
	meta/FlexibleSUSY.m


  Commit: f6f3e6d22766bbf5eb4d9d6aeb06abe303d9c905
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/f6f3e6d22766bbf5eb4d9d6aeb06abe303d9c905
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-07-12 (Sun, 12 Jul 2015)

  Changed paths:
    M templates/high_scale_spectrum_generator.hpp.in
    M templates/low_scale_spectrum_generator.hpp.in
    M templates/spectrum_generator_interface.hpp.in

  Log Message:
  -----------
  correcting header inclusion condition


Compare: https://github.com/FlexibleSUSY/FlexibleSUSY/compare/4e6a97080a5b...f6f3e6d22766