Merge remote-tracking branch 'origin/release-2021' into merge-2021-into-master
authorAndrey Alekseenko <al42and@gmail.com>
Thu, 19 Aug 2021 09:51:13 +0000 (12:51 +0300)
committerAndrey Alekseenko <al42and@gmail.com>
Thu, 19 Aug 2021 10:10:25 +0000 (13:10 +0300)
commit45ba560ef782eb047e43997cc14629ff86cf91ac
tree7bfb21489e5acbf34f7775148094999ee9551498
parent4e59c12c77962ca226b0503cb75c180ddb8bd30b
parentc62c49949017dcc63eefde681194d0ef5405a631
Merge remote-tracking branch 'origin/release-2021' into merge-2021-into-master

Resolved conflicts:
 - cmake/gmxVersionInfo.cmake
 - docs/CMakeLists.txt
 - python_packaging/src/gmxapi/export_system.cpp
 - python_packaging/src/setup.py
 - src/gromacs/domdec/domdec.cpp
 - src/gromacs/gmxana/gmx_chi.cpp
12 files changed:
cmake/gmxVersionInfo.cmake
docs/CMakeLists.txt
docs/release-notes/index.rst
python_packaging/src/CMakeLists.txt
python_packaging/src/gmxapi/export_system.cpp
python_packaging/src/setup.py
src/gromacs/domdec/domdec.cpp
src/gromacs/domdec/domdec.h
src/gromacs/domdec/domdec_internal.h
src/gromacs/gmxana/anadih.cpp
src/gromacs/gmxana/gmx_chi.cpp
src/gromacs/mdrun/runner.cpp