Public Git Hosting - gromacs/AngularHB.git/commit

commit	60dc492792a6d423aad82b3be9ad91755cb457ce
author	Mark Abraham <mark.j.abraham@gmail.com>
	Thu, 2 Nov 2017 09:43:11 +0000 (2 10:43 +0100)
committer	Mark Abraham <mark.j.abraham@gmail.com>
	Thu, 2 Nov 2017 09:56:11 +0000 (2 10:56 +0100)
tree	1a5b6fd97b782c2f9848d206c9247a661c6781de	tree \| snapshot (tar.gz zip)
parent	efd495509bf859d229012c3a92b507ff99ead47e	commit \| diff
parent	368b44635d6b539a20bba6b54803849bce4fc1c6	commit \| diff

Merge branch release-2016

Ensured fix for gmx compare cmp_atoms went to the right code.

Change-Id: Iabc8ec03e7ebc45517f63697c3e7dea12b3f5398

docs/manual/algorithms.tex	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/wall.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/tables/forcetable.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/taskassignment/resourcedivision.cpp	diff1 \|	\|	blob \| history
src/gromacs/topology/atoms.cpp	diff1 \|	diff2 \|	blob \| history