Merge branch release-2020 into merge-2020-into-2021
authorPaul Bauer <paul.bauer.q@gmail.com>
Thu, 4 Mar 2021 15:34:41 +0000 (16:34 +0100)
committerPaul Bauer <paul.bauer.q@gmail.com>
Fri, 5 Mar 2021 07:48:31 +0000 (08:48 +0100)
commit874b87aba0ac3c64e16fff76703f009fc652d6f2
treef3091db54949b30a4999c2ce30ed945cf34d3cac
parente3381bcf19b2ec165f571ac384b3ad0e596a7eb5
parent7919cfc88c6bbd6daac2a1ad6c828b4e1c748f0c
Merge branch release-2020 into merge-2020-into-2021

Resolved Conflicts:
cmake/gmxVersionInfo.cmake
src/gromacs/gmxpreprocess/readir.cpp
src/gromacs/gmxpreprocess/readir.cpp
src/gromacs/mdrun/runner.cpp