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)
commitc48fa57cff44605d961a522daf622403d608edda
treee093e59b5035fed935a0977d6ea467f70389c321
parentda0483acfd2801f5e9f103efee30a54d46812715
parent45257cb20bae28480a11e59f015ff84ddeb7d427
Merge "Merge branch release-2018"
src/gromacs/mdlib/forcerec.cpp
src/programs/mdrun/runner.cpp