Merge branch release-5-1 into release-2016
authorMark Abraham <mark.j.abraham@gmail.com>
Thu, 8 Sep 2016 10:40:51 +0000 (12:40 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Thu, 8 Sep 2016 10:44:55 +0000 (12:44 +0200)
commit73d91d6c56f9478697ad888149b75a864de2b7fc
tree1ca8cd50eb9a27b0cd63d9933ae8542bf2240919
parent30ee01e890001287096b747672a6332d120ef570
parent9de0ecabafc51566b0be96edddbd61d30ef2e31e
Merge branch release-5-1 into release-2016

Trivial conflicts in minimize.cpp from bug fix in same region that now
has exceptions caught within an OpenMP region.

Change-Id: I8b3c269a2afd7d4967e0f7310c96af6022533ddd
src/gromacs/mdlib/minimize.cpp