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)
No conflicts

Change-Id: Iababf3d2439f1b465ebdf8bcb3d29815cb7830e1

1  2 
src/gromacs/ewald/pme-solve.cpp

Simple merge