Merge release-5-0 into master
authorMark Abraham <mark.j.abraham@gmail.com>
Thu, 25 Jun 2015 08:47:53 +0000 (10:47 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Thu, 25 Jun 2015 09:25:13 +0000 (11:25 +0200)
commit560e0d367b41529564d42a9e47aa7dba386a2835
treec230fa1015564687d951aeda1c078a8b364030f4
parent0d2e798828b2a2987e3bcecb5465548a3048037d
parentfadb3ecbf47b9b2d1cafbc9c09b3c9621ecd8d0f
Merge release-5-0 into master

Conflicts:
docs/install-guide/install-guide.md
Applied release-5-0 changes to docs/install-guide/index.rst

docs/manual/install.tex
Applied release-5-0 changes to docs/user-guide/environment-variables.rst

src/gromacs/commandline/cmdlineprogramcontext.cpp
Applied comment from release-5-0

src/gromacs/gmxana/gmx_hbond.c
Removed smooth_tail as in release-5-0

src/gromacs/gmxlib/gmx_detect_hardware.cpp
Removed GMX_MAX_THREADS implementation as in release-5-0
(adjacent changes)

src/gromacs/utility/init.cpp
Combined changes to include statements

src/gromacs/utility/path.cpp
Combined changes to include statements

src/programs/mdrun/mdrun.cpp
Added new please_cite calls from release-5-0 to new call site
in runner.cpp

Change-Id: I5b75b12bb8a49a606b086184017b754477d65068
26 files changed:
CMakeLists.txt
docs/install-guide/index.rst
docs/manual/analyse.tex
docs/user-guide/environment-variables.rst
src/gromacs/commandline/cmdlineprogramcontext.cpp
src/gromacs/fft/fft5d.cpp
src/gromacs/fileio/confio.c
src/gromacs/fileio/trxio.c
src/gromacs/gmxana/gmx_analyze.c
src/gromacs/gmxana/gmx_density.c
src/gromacs/gmxana/gmx_gyrate.c
src/gromacs/gmxana/gmx_hbond.c
src/gromacs/gmxana/gmx_rmsdist.c
src/gromacs/gmxana/gmx_trjconv.c
src/gromacs/gmxana/gstat.h
src/gromacs/gmxlib/copyrite.cpp
src/gromacs/gmxlib/gmx_detect_hardware.cpp
src/gromacs/gmxpreprocess/gen_ad.c
src/gromacs/gmxpreprocess/pdb2gmx.c
src/gromacs/gmxpreprocess/readir.c
src/gromacs/gmxpreprocess/topio.c
src/gromacs/utility/exceptions.h
src/gromacs/utility/init.cpp
src/gromacs/utility/path.h
src/programs/mdrun/mdrun.cpp
src/programs/mdrun/runner.cpp