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)
Resolved Conflicts:
cmake/gmxVersionInfo.cmake
src/gromacs/gmxpreprocess/readir.cpp

1  2 
src/gromacs/gmxpreprocess/readir.cpp
src/gromacs/mdrun/runner.cpp

Simple merge
Simple merge