Public Git Hosting - gromacs.git/commit

commit	0f9c8b5956379b272474467d8314fe4ded9b0a2c
author	Mark Abraham <mark.j.abraham@gmail.com>
	Mon, 28 Dec 2015 00:24:52 +0000 (28 11:24 +1100)
committer	Mark Abraham <mark.j.abraham@gmail.com>
	Mon, 28 Dec 2015 00:51:25 +0000 (28 11:51 +1100)
tree	9517538d028a83f7ee00ceeb0ada8acb54925812	tree \| snapshot (tar.gz zip)
parent	baf984c91d4e620bcca15200c25f59ef0601dac4	commit \| diff
parent	ad8209b537febfa3c39b994ef417b42366da2803	commit \| diff

Merge branch release-5-1

Change-Id: Ife0732459cf9d438347c94b88efb5aca7a81bca1

The ultimate molecular dynamics simulation package

docs/install-guide/index.rst	diff1 \|	diff2 \|	blob \| history
src/gromacs/gpu_utils/oclutils.cpp	diff1 \|	\|	blob \| history
src/gromacs/gpu_utils/oclutils.h	diff1 \|	\|	blob \| history
src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_types.h	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/tests/moduletest.cpp	diff1 \|	diff2 \|	blob \| history