Merge "Merge branch release-2018"
authorMark Abraham <mark.j.abraham@gmail.com>
Tue, 13 Mar 2018 08:52:50 +0000 (09:52 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Tue, 13 Mar 2018 08:52:50 +0000 (09:52 +0100)
1  2 
src/gromacs/mdlib/forcerec.cpp
src/programs/mdrun/runner.cpp

Simple merge
Simple merge