[Flexiblesusy-commits] [FlexibleSUSY/FlexibleSUSY] 2fd879: rename symbol to avoid conflict with SARAH`nf[]

[GitHub]

  Branch: refs/heads/feature-complex-parameters
  Home:   https://github.com/FlexibleSUSY/FlexibleSUSY
  Commit: 2fd879ee4f83cb8a5d338a566162ece41c32471d
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/2fd879ee4f83cb8a5d338a566162ece41c32471d
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-04-17 (Fri, 17 Apr 2015)

  Changed paths:
    M meta/TwoLoop.m

  Log Message:
  -----------
  rename symbol to avoid conflict with SARAH`nf[]


  Commit: 73d082d73b10a2243ed1315b3bd054dde56a0182
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/73d082d73b10a2243ed1315b3bd054dde56a0182
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-04-17 (Fri, 17 Apr 2015)

  Changed paths:
    M meta/TwoLoop.m

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


  Commit: 96d1b5d2075b67f26cced9e3d17942c15a74aae6
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/96d1b5d2075b67f26cced9e3d17942c15a74aae6
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M model_files/CMSSMCPV/FlexibleSUSY.m.in

  Log Message:
  -----------
  splitting output into SLHA-1 like blocks


  Commit: 1baf83845ca5b666afe17fce59a1657dc13986ad
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/1baf83845ca5b666afe17fce59a1657dc13986ad
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M test/test_run_all_spectrum_generators.sh

  Log Message:
  -----------
  run CMSSMCPV in the tests


  Commit: 5c52f7d5c05d241a19e730316661d8325aaaf749
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/5c52f7d5c05d241a19e730316661d8325aaaf749
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M test/module.mk
    A test/test_CMSSMCPV_tree_level_spectrum.cpp

  Log Message:
  -----------
  adding test to compare the tree-level spectra of CMSSM and CMSSMCPV


Compare: https://github.com/FlexibleSUSY/FlexibleSUSY/compare/56afe93e0b3b...5c52f7d5c05d