Merge branch release-2016
authorMark Abraham <mark.j.abraham@gmail.com>
Tue, 12 Sep 2017 10:01:48 +0000 (12:01 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Tue, 12 Sep 2017 10:02:20 +0000 (12:02 +0200)
commit9a05de960184a62586814ada2a1bb4fa8de4b9d6
treedb37faec289932381f60ee9b61e155cf4307885f
parent85e7dd1899c9e299041df8234495d4e356ca52ac
parent16f9979fb325ca898e2d26b2ae0244908e761fb5
Merge branch release-2016

No conflicts

Change-Id: Iababf3d2439f1b465ebdf8bcb3d29815cb7830e1
src/gromacs/ewald/pme-solve.cpp