Public Git Hosting - gromacs.git/commit

commit	58f5c06fe8bdd01b3f29d144d212573dbaf2ef04
author	Paul Bauer <paul.bauer.q@gmail.com>
	Tue, 24 Nov 2020 15:58:43 +0000 (24 16:58 +0100)
committer	Paul Bauer <paul.bauer.q@gmail.com>
	Tue, 24 Nov 2020 15:58:43 +0000 (24 16:58 +0100)
tree	e7a603d21fb6538a495dc9324fc7e674fb6d3085	tree \| snapshot (tar.gz zip)
parent	0787bf7e66a9a1c432578ca0bd93d27432d795a7	commit \| diff
parent	ce297e4511eba9e2705c0b4f5c7c3d4a16225ac1	commit \| diff

Merge branch 'origin/release-2021' into merge-2021-into-master

Resolved Conflicts:
cmake/gmxVersionInfo.cmake
docs/release-notes/index.rst
src/gromacs/mdlib/CMakeLists.txt
src/gromacs/mdrun/md.cpp

17 files changed:

admin/gitlab-ci/archive.gitlab-ci.yml	diff1 \|	diff2 \|	blob \| history
admin/gitlab-ci/gromacs.gitlab-ci.yml	diff1 \|	diff2 \|	blob \| history
admin/gitlab-ci/lint.gitlab-ci.yml	diff1 \|	diff2 \|	blob \| history
admin/gitlab-ci/python-gmxapi.gitlab-ci.yml	diff1 \|	diff2 \|	blob \| history
admin/gitlab-ci/sample_restraint.gitlab-ci.yml	diff1 \|	diff2 \|	blob \| history
api/nblib/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
api/nblib/tests/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
cmake/gmxVersionInfo.cmake	diff1 \|	diff2 \|	blob \| history
docs/release-notes/index.rst	diff1 \|	diff2 \|	blob \| history
python_packaging/src/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/gromacs/hardware/detecthardware.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdrun/md.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/nbnxm/nbnxm_gpu_data_mgmt.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/simd/support.cpp	diff1 \|	diff2 \|	blob \| history
src/programs/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/testutils/test_hardware_environment.cpp	diff1 \|	diff2 \|	blob \| history

The ultimate molecular dynamics simulation package

RSS Atom

admin/gitlab-ci/archive.gitlab-ci.yml	diff1 \|	diff2 \|	blob \| history
admin/gitlab-ci/gromacs.gitlab-ci.yml	diff1 \|	diff2 \|	blob \| history
admin/gitlab-ci/lint.gitlab-ci.yml	diff1 \|	diff2 \|	blob \| history
admin/gitlab-ci/python-gmxapi.gitlab-ci.yml	diff1 \|	diff2 \|	blob \| history
admin/gitlab-ci/sample_restraint.gitlab-ci.yml	diff1 \|	diff2 \|	blob \| history
api/nblib/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
api/nblib/tests/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
cmake/gmxVersionInfo.cmake	diff1 \|	diff2 \|	blob \| history
docs/release-notes/index.rst	diff1 \|	diff2 \|	blob \| history
python_packaging/src/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/gromacs/hardware/detecthardware.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdrun/md.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/nbnxm/nbnxm_gpu_data_mgmt.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/simd/support.cpp	diff1 \|	diff2 \|	blob \| history
src/programs/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/testutils/test_hardware_environment.cpp	diff1 \|	diff2 \|	blob \| history