Merge 'origin/release-2019' into release-2020
authorPaul Bauer <paul.bauer.q@gmail.com>
Wed, 20 Nov 2019 17:34:52 +0000 (18:34 +0100)
committerPaul Bauer <paul.bauer.q@gmail.com>
Wed, 20 Nov 2019 17:34:52 +0000 (18:34 +0100)
commitdad519b03cf4bdd557782ce65a8b25f885905f6f
tree45700890d1f310d60853abb7264f139cea20cb2f
parent7519efe5af2e04c1be6287292f9e7c8775f2c49f
parent2f99f9a6c4221534354f9d7a3c8df374e183f252
Merge 'origin/release-2019' into release-2020

Resolved Conflicts:
docs/release-notes/2019/2019.5.rst
src/gromacs/domdec/domdec_topology.cpp
src/gromacs/fileio/groio.cpp

Change-Id: Icd9d3bfee7a2ba524057791f4ee0fcf8db13797f
cmake/gmxCFlags.cmake
src/gromacs/domdec/domdec_topology.cpp
src/gromacs/fileio/groio.cpp