Merge branch 'release-2018' into master
authorAleksei Iupinov <a.yupinov@gmail.com>
Thu, 8 Feb 2018 10:47:06 +0000 (11:47 +0100)
committerAleksei Iupinov <a.yupinov@gmail.com>
Thu, 8 Feb 2018 10:48:10 +0000 (11:48 +0100)
commitc3ab8222330d5f2bc47fa42cbf3e74965d8eed1b
treec623c8984f9797de48f807c0449d8c22d3870259
parent8e885eed52595f75d1f8dd1ce5161447f8fcc67b
parent58e265e7d88ffb580e11718e2fa8f06a4589efbf
Merge branch 'release-2018' into master

Manually modified:
src/programs/mdrun/md.cpp (to uncomment done_ebin())

Change-Id: Ic3887c40668f69e69ee8da15d210721b8bd3e95f
src/gromacs/gmxlib/nonbonded/nb_generic.cpp
src/gromacs/listed-forces/bonded.cpp
src/gromacs/mdlib/forcerec.cpp
src/gromacs/mdlib/mdebin.cpp
src/gromacs/mdlib/tpi.cpp
src/programs/mdrun/md.cpp