BioD PNPI Git Repos - alexxy/gromacs.git/commit - src/gromacs/applied

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

Resolved Conflicts:
admin/gitlab-ci/archive.gitlab-ci.yml
admin/gitlab-ci/global.gitlab-ci.yml
admin/gitlab-ci/gromacs.gitlab-ci.yml
admin/gitlab-ci/lint.gitlab-ci.yml
admin/gitlab-ci/python-gmxapi.gitlab-ci.yml
admin/gitlab-ci/rules.gitlab-ci.yml
admin/gitlab-ci/sample_restraint-regression.gitlab-ci.yml
cmake/gmxVersionInfo.cmake
src/gromacs/fileio/checkpoint.cpp
src/gromacs/hardware/printhardware.cpp
src/gromacs/mdlib/md_support.cpp
src/gromacs/mdlib/trajectory_writing.cpp
src/gromacs/mdrun/runner.cpp
src/gromacs/modularsimulator/domdechelper.cpp
src/gromacs/modularsimulator/domdechelper.h
src/gromacs/modularsimulator/freeenergyperturbationelement.cpp
src/gromacs/modularsimulator/freeenergyperturbationelement.h
src/gromacs/modularsimulator/modularsimulator.cpp
src/gromacs/tools/trjcat.cpp
src/gromacs/topology/topology.h
src/gromacs/utility/fatalerror.cpp
src/gromacs/utility/futil.cpp
src/gromacs/utility/init.cpp
src/programs/mdrun/tests/CMakeLists.txt
tests/CMakeLists.txt

Change-Id: Icd5d9c78ff2cfb0598c3cb55b057487ca098a1f0

author	Paul Bauer <paul.bauer.q@gmail.com>
	Wed, 7 Oct 2020 06:55:19 +0000 (08:55 +0200)
committer	Paul Bauer <paul.bauer.q@gmail.com>
	Wed, 7 Oct 2020 06:55:19 +0000 (08:55 +0200)
commit	694edca8e684c5efd910e19e1a685827a258b2ba
tree	7a790509aa81062765d18ec89ed400bc86fdb302	tree \| snapshot
parent	b6b389bc151872cb8937acc0247542ce42bf383e	commit \| diff
parent	e3caeee06b4a7bee1f3f0d06b3f22f226873078e	commit \| diff

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
admin/gitlab-ci/global.gitlab-ci.yml	diff1 \|	diff2 \|	blob \| history
admin/gitlab-ci/rules.gitlab-ci.yml	diff1 \|	diff2 \|	blob \| history
cmake/gmxTestImageMagick.cmake	diff1 \|	diff2 \|	blob \| history
docs/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
docs/doxygen/suppressions.txt	diff1 \|	diff2 \|	blob \| history
docs/release-notes/index.rst	diff1 \|	diff2 \|	blob \| history
src/gromacs/fileio/checkpoint.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/readir.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/hardware/printhardware.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/mdoutf.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/trajectory_writing.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdrun/md.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdrun/runner.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdtypes/state_propagator_data_gpu.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/tables/forcetable.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/tools/trjcat.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/topology/topology.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/utility/fatalerror.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/utility/futil.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/utility/init.cpp	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/tests/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
tests/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history