Merge release-4-6 into release-5-0
Conflicts:
CMakeLists.txt
share/top/oplsaa.ff/watermodels.dat
src/gromacs/fileio/trxio.c
src/gromacs/gmxana/anadih.c
src/gromacs/gmxana/gmx_chi.c
src/gromacs/gmxana/gmx_tcaf.c
src/gromacs/gmxlib/checkpoint.c
src/gromacs/legacyheaders/tables.h
src/gromacs/mdlib/shellfc.c
src/gromacs/mdlib/tables.c
src/gromacs/pulling/pull.c
src/kernel/readpull.c -> applied to
src/gromacs/gmxpreprocess/readpull.c
src/programs/mdrun/repl_ex.c
Change ignored because was already merged:
src/gromacs/mdlib/sim_util.c
Deleted. No merge:
src/gmxlib/gpu_utils/dummy.cpp
Removal of INSTALL_NAME_DIR not necessary because
was already not there anymore:
src/gmxlib/CMakeLists.txt
src/tools/CMakeLists.txt
src/kernel/CMakeLists.txt
src/mdlib/CMakeLists.txt
Tools deleted - no merge:
src/tools/gmx_bond.c
src/tools/gmx_kinetics.c
Change-Id: Ibeb5a23cce94fb1765ebee271c9c92e001b83630
44 files changed: