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)
1  2 
src/gromacs/gmxpreprocess/hackblock.cpp
src/gromacs/mdlib/shake.cpp

Simple merge