Merge branch release-5-1
authorMark Abraham <mark.j.abraham@gmail.com>
Mon, 28 Dec 2015 00:24:52 +0000 (11:24 +1100)
committerMark Abraham <mark.j.abraham@gmail.com>
Mon, 28 Dec 2015 00:51:25 +0000 (11:51 +1100)
commit0f9c8b5956379b272474467d8314fe4ded9b0a2c
tree9517538d028a83f7ee00ceeb0ada8acb54925812
parentbaf984c91d4e620bcca15200c25f59ef0601dac4
parentad8209b537febfa3c39b994ef417b42366da2803
Merge branch release-5-1

Change-Id: Ife0732459cf9d438347c94b88efb5aca7a81bca1
docs/install-guide/index.rst
src/gromacs/gpu_utils/oclutils.cpp
src/gromacs/gpu_utils/oclutils.h
src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl.cpp
src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_types.h
src/programs/mdrun/tests/moduletest.cpp