Public Git Hosting - gromacs.git/commit

commit	0129e2ccd1753d49c919d32ede523f214d3e8432
author	Paul Bauer <paul.bauer.q@gmail.com>
	Fri, 27 Dec 2019 12:58:41 +0000 (27 13:58 +0100)
committer	Paul Bauer <paul.bauer.q@gmail.com>
	Fri, 27 Dec 2019 12:58:41 +0000 (27 13:58 +0100)
tree	32938fb5ef0364236383d69ba1d33f888c431adf	tree \| snapshot (tar.gz zip)
parent	a60b85cdf1c9ae87533e1b718ee4eea409b3b61c	commit \| diff
parent	ea409ccc85e1f66961673fe7d539b7a0693d6e39	commit \| diff

Merge origin/release-2019 into release-2020

Resolved Conflicts:
cmake/FindHwloc.cmake
cmake/gmxVersionInfo.cmake
docs/CMakeLists.txt
src/gromacs/gmxana/anadih.cpp
src/gromacs/gmxana/gmx_angle.cpp
src/gromacs/mdlib/forcerec.cpp

Change-Id: Ie4408c932a712d4f9d1f42117a512e0474535df5

The ultimate molecular dynamics simulation package

RSS Atom

docs/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
docs/release-notes/index.rst	diff1 \|	diff2 \|	blob \| history
src/gromacs/fileio/pdbio.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxana/anadih.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxana/angle_correction.cpp	\|	diff2 \|	blob \| history
src/gromacs/gmxana/cmat.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxana/gmx_angle.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/forcerec.cpp	diff1 \|	diff2 \|	blob \| history