Merge branch 'origin/release-2020' into merge-release-2020
authorPaul Bauer <paul.bauer.q@gmail.com>
Tue, 20 Oct 2020 14:50:31 +0000 (16:50 +0200)
committerPaul Bauer <paul.bauer.q@gmail.com>
Tue, 20 Oct 2020 14:50:31 +0000 (16:50 +0200)
commit005e56d8025eb9ac9648012c894403eeb2d8e9b2
treec0afd0ea39998f6c329343e0e02a8befa9288068
parent9baf5dcc540878dc0b15d8b945ac760d36fbf75d
parent8268b165c64c8723673766ffa23b7571e3c423b0
Merge branch 'origin/release-2020' into merge-release-2020
src/gromacs/gmxpreprocess/hackblock.cpp
src/gromacs/mdlib/shake.cpp