Merge branch release-5-1 into release-2016
authorMark Abraham <mark.j.abraham@gmail.com>
Mon, 27 Jun 2016 14:08:42 +0000 (16:08 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Mon, 27 Jun 2016 14:09:30 +0000 (16:09 +0200)
commit628f3b1c8866ae9180e25e29ee7bea1ff9cbe5f2
treedae231c582824afc6c33bc7c3dedab6fba590c35
parent0e31b39cff097be192272615abee0344336eeef2
parente65c43da16aac8411a27ac1952d1e035c2a095ad
Merge branch release-5-1 into release-2016

Omitted the patch that removed support for mdrun -multi -maxh, since
support for that will be reinstated very shortly.

Change-Id: I10e71dddc5c4fb8f32425da7390b64d64e4b16dd
src/gromacs/gmxana/gmx_dos.cpp