Merge branch release-2020 into merge-2020-into-2021
authorPaul Bauer <paul.bauer.q@gmail.com>
Thu, 7 Jan 2021 14:11:04 +0000 (15:11 +0100)
committerPaul Bauer <paul.bauer.q@gmail.com>
Thu, 7 Jan 2021 14:11:04 +0000 (15:11 +0100)
commit54596b63fabfd35da71d73a497affda2d1be736d
tree19623d343b87bd145a6cb7980d87e92aee790d30
parent259382602b7bd851fef76476f2904a10e4ce2c94
parentb056f9615b7c7b834eb14cae10c57aa77deed8d6
Merge branch release-2020 into merge-2020-into-2021

Resolved Conflicts:
cmake/gmxVersionInfo.cmake
docs/CMakeLists.txt
docs/conf.cmakein.py
src/gromacs/gmxpreprocess/readir.cpp
src/gromacs/mdlib/expanded.cpp
src/gromacs/mdlib/tests/CMakeLists.txt
12 files changed:
docs/CMakeLists.txt
docs/conf.cmakein.py
docs/release-notes/index.rst
src/gromacs/applied_forces/awh/biasstate.cpp
src/gromacs/applied_forces/electricfield.cpp
src/gromacs/gmxpreprocess/readir.cpp
src/gromacs/mdlib/coupling.cpp
src/gromacs/mdlib/expanded.cpp
src/gromacs/mdlib/tests/CMakeLists.txt
src/gromacs/mdrun/md.cpp
src/gromacs/pulling/pull.cpp
tests/CMakeLists.txt