Merge origin/release-2019 into release-2020
authorPaul Bauer <paul.bauer.q@gmail.com>
Fri, 27 Dec 2019 12:58:41 +0000 (13:58 +0100)
committerPaul Bauer <paul.bauer.q@gmail.com>
Fri, 27 Dec 2019 12:58:41 +0000 (13:58 +0100)
commit0129e2ccd1753d49c919d32ede523f214d3e8432
tree32938fb5ef0364236383d69ba1d33f888c431adf
parenta60b85cdf1c9ae87533e1b718ee4eea409b3b61c
parentea409ccc85e1f66961673fe7d539b7a0693d6e39
Merge origin/release-2019 into release-2020

Resolved Conflicts:
cmake/FindHwloc.cmake
cmake/gmxVersionInfo.cmake
docs/CMakeLists.txt
src/gromacs/gmxana/anadih.cpp
src/gromacs/gmxana/gmx_angle.cpp
src/gromacs/mdlib/forcerec.cpp

Change-Id: Ie4408c932a712d4f9d1f42117a512e0474535df5
docs/CMakeLists.txt
docs/release-notes/index.rst
src/gromacs/fileio/pdbio.cpp
src/gromacs/gmxana/anadih.cpp
src/gromacs/gmxana/angle_correction.cpp
src/gromacs/gmxana/cmat.cpp
src/gromacs/gmxana/gmx_angle.cpp
src/gromacs/mdlib/forcerec.cpp