[Flexiblesusy-commits] [FlexibleSUSY/FlexibleSUSY] 6881c8: very minor change to english and added comment abo...

[GitHub]

  Branch: refs/heads/lattice
  Home:   https://github.com/FlexibleSUSY/FlexibleSUSY
  Commit: 6881c80da51e3f24674a38856c377e12b8e7b40f
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/6881c80da51e3f24674a38856c377e12b8e7b40f
  Author: Peter Athron <peter.athron at adelaide.edu.au>
  Date:   2014-05-27 (Tue, 27 May 2014)

  Changed paths:
    M doc/paper.tex

  Log Message:
  -----------
  very minor change to english and added comment about B\mu = 0 claim.
Wanted to make change when spotted or I'd forget. hope doesn't cause merge
problems with Dominik.


  Commit: 7fe012b1628b19635e5c76a267a962ece3d2e3cc
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/7fe012b1628b19635e5c76a267a962ece3d2e3cc
  Author: Jae-hyeon Park <jhyeon at gmail.com>
  Date:   2014-05-27 (Tue, 27 May 2014)

  Changed paths:
    M .gitattributes
    M meta/module.mk
    M src/module.mk
    M templates/module.mk
    M templates/module.mk.in

  Log Message:
  -----------
  Suppress lattice code from releases


  Commit: f83382d79da028bacc4b589c81cfdf1718e427b3
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/f83382d79da028bacc4b589c81cfdf1718e427b3
  Author: Jae-hyeon Park <jhyeon at gmail.com>
  Date:   2014-05-27 (Tue, 27 May 2014)

  Changed paths:
    M meta/FlexibleSUSY.m

  Log Message:
  -----------
  Print full name of an author


  Commit: ea990e0b1f3b3ac5e226feb145bf730cbb0476ce
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/ea990e0b1f3b3ac5e226feb145bf730cbb0476ce
  Author: Jae-hyeon Park <jhyeon at gmail.com>
  Date:   2014-05-27 (Tue, 27 May 2014)

  Changed paths:
    M .gitattributes
    M meta/FlexibleSUSY.m
    M meta/module.mk
    M src/module.mk

  Log Message:
  -----------
  Merge branch 'development' into lattice

Conflicts:
	meta/FlexibleSUSY.m
	meta/module.mk
	src/module.mk
	templates/module.mk
	templates/module.mk.in


Compare: https://github.com/FlexibleSUSY/FlexibleSUSY/compare/87e5b069e8f8...ea990e0b1f3b