Merge release-5-0 into release-5-1
authorMark Abraham <mark.j.abraham@gmail.com>
Mon, 5 Oct 2015 19:36:02 +0000 (21:36 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Mon, 5 Oct 2015 20:20:44 +0000 (22:20 +0200)
commit4ca7859398f32d04bc62d1b0ff62b7a4c7b0ab52
tree693a7a83538a627f3bd2755a558050c3a13e175a
parente081d6331ebc02f81f344a0353659303e5db7a9e
parent1909f2ffe7d9d248e1f04da505c4c6bac0d7ee76
Merge release-5-0 into release-5-1

Conflicts:
cmake/gmxManageFFTLibraries.cmake
Fixes from release-5-0 goes in only one branch of the refactoring in
release-5-1 that separate the own-fftw build from an installed-fftw
build.

docs/manual/monster.bib
Insertions in both branches, both retained

src/gromacs/gmxana/gmx_wham.cpp
Fixed formatting of copyrighted years.

src/programs/mdrun/mdrun.cpp
Relocation of please_cite() calls was adjacent to removal of bSepPot,
trivial resolution

Change-Id: I9d6116534775906d74ddbd45925176a21b5afcd9
cmake/FindFFTW.cmake
cmake/gmxManageFFTLibraries.cmake
docs/manual/gromacs.tex
docs/manual/monster.bib
src/gromacs/gmxana/dlist.c
src/gromacs/gmxana/gmx_energy.c
src/gromacs/gmxana/gmx_wham.cpp
src/gromacs/gmxlib/copyrite.cpp
src/gromacs/swap/swapcoords.cpp
src/programs/mdrun/runner.cpp