Public Git Hosting - gromacs.git/commit

commit	a89205b3226574a7cfd14d8e45feafa4cc661f4f
author	Mark Abraham <mark.j.abraham@gmail.com>
	Mon, 4 Dec 2017 09:18:21 +0000 (4 10:18 +0100)
committer	Mark Abraham <mark.j.abraham@gmail.com>
	Mon, 4 Dec 2017 09:23:35 +0000 (4 10:23 +0100)
tree	f8a24a3abb7e662080bed8b6919e3c4124ef4d7f	tree \| snapshot (tar.gz zip)
parent	50d50553ba30ea4935f611343fb66cd07202467e	commit \| diff
parent	f8c70b1dfc93a264da00bcb19b827d5ac60dec06	commit \| diff

Merge branch release-2016 into release-2018

Change-Id: If84bee0ff744533c841532efbf29e6338c412c5a

The ultimate molecular dynamics simulation package

docs/manual/algorithms.tex	diff1 \|	diff2 \|	blob \| history
docs/user-guide/mdp-options.rst	diff1 \|	diff2 \|	blob \| history
src/gromacs/fileio/enxio.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxana/gmx_genion.cpp	diff1 \|	diff2 \|	blob \| history