Merge branch release-2018
authorMark Abraham <mark.j.abraham@gmail.com>
Fri, 13 Apr 2018 10:09:09 +0000 (11:09 +0100)
committerAleksei Iupinov <a.yupinov@gmail.com>
Fri, 13 Apr 2018 11:21:44 +0000 (13:21 +0200)
commit4fa7c38d51c58534f4c26df7c975077328dfc251
tree9d5204cba3e6f71d18f0152c1aadb288a647f648
parent15c96888c3fb03b836a39decf324675622f7dd4c
parentf2c9e7785cf77a6b6ede7a39654578185f4b285b
Merge branch release-2018

Minor conflicts documenting gpuregiontimer_ocl.h, resolved
with a suitable mix from both branches.

Change-Id: I5bb417acaff941f18730f0417c5e46c8f4c2fc1e
docs/user-guide/mdp-options.rst
docs/user-guide/terminology.rst
src/gromacs/gpu_utils/gpuregiontimer_ocl.h