Merge release-2019 into master
authorRoland Schulz <roland.schulz@intel.com>
Thu, 15 Nov 2018 04:43:48 +0000 (20:43 -0800)
committerPaul Bauer <paul.bauer.q@gmail.com>
Fri, 16 Nov 2018 15:15:48 +0000 (16:15 +0100)
commit0ca6e2bb2d90958145f6e42e50dac26d4334f2cb
tree7afbdb9ee386c7eceef3626d2c3864ea77a0715e
parent2d00fffddc67de0f523b8c1b1752b3843855636b
parentf43126c31f8d2e694cb95b66fdf56add7830a178
Merge release-2019 into master

Trivial conflicts in:
cmake/gmxVersionInfo.cmake
src/gromacs/listed-forces/manage-threading.cpp
src/gromacs/utility/coolstuff.cpp

Change-Id: Ic23b55432a22a4a79da09e72b609615d2b421128
cmake/gmxVersionInfo.cmake
docs/CMakeLists.txt
docs/release-notes/2019/major/deprecated-functionality.rst
src/gromacs/mimic/MimicCommunicator.cpp
src/gromacs/utility/coolstuff.cpp