| commit | ce297e4511eba9e2705c0b4f5c7c3d4a16225ac1 | |
| author | Paul Bauer <paul.bauer.q@gmail.com> | |
| Tue, 24 Nov 2020 13:38:39 +0000 (24 14:38 +0100) | ||
| committer | Paul Bauer <paul.bauer.q@gmail.com> | |
| Tue, 24 Nov 2020 14:15:08 +0000 (24 15:15 +0100) | ||
| tree | ffbcffca4769f8a9f03761eddad1ac69feb28e4f | treesnapshot (tar.gz zip) |
| parent | a62597cfcaf5fc9c435dd723872145cc39d65887 | commitdiff |
| parent | e2ebcdb75f3e10628e23a671a9a4bfd362934861 | commitdiff |
Merge branch 'origin/release-2020' into merge-2020-into-2021
Resolved Conflicts:
admin/containers/scripted_gmx_docker_builds.py
docs/conf.cmakein.py
docs/dev-manual/change-management.rst
docs/dev-manual/contribute.rst
docs/dev-manual/releng/index.rst
docs/dev-manual/tools.rst
docs/install-guide/index.rst
docs/reference-manual/preface.rst
docs/release-notes/index.rst
scripts/GMXRC.bash.cmakein
src/gromacs/gmxana/gmx_covar.cpp
src/gromacs/gmxana/gmx_do_dssp.cpp
src/gromacs/gmxana/gmx_h2order.cpp
src/gromacs/gmxana/nsfactor.cpp
src/gromacs/hardware/detecthardware.cpp
src/gromacs/mdlib/coupling.cpp
src/gromacs/mdrun/md.cpp
src/gromacs/mdtypes/state.h
src/gromacs/trajectoryanalysis/modules/pairdist.cpp
src/gromacs/utility/basedefinitions.h
Resolved Conflicts:
admin/containers/scripted_gmx_docker_builds.py
docs/conf.cmakein.py
docs/dev-manual/change-management.rst
docs/dev-manual/contribute.rst
docs/dev-manual/releng/index.rst
docs/dev-manual/tools.rst
docs/install-guide/index.rst
docs/reference-manual/preface.rst
docs/release-notes/index.rst
scripts/GMXRC.bash.cmakein
src/gromacs/gmxana/gmx_covar.cpp
src/gromacs/gmxana/gmx_do_dssp.cpp
src/gromacs/gmxana/gmx_h2order.cpp
src/gromacs/gmxana/nsfactor.cpp
src/gromacs/hardware/detecthardware.cpp
src/gromacs/mdlib/coupling.cpp
src/gromacs/mdrun/md.cpp
src/gromacs/mdtypes/state.h
src/gromacs/trajectoryanalysis/modules/pairdist.cpp
src/gromacs/utility/basedefinitions.h
20 files changed: