Merge branch release-2016
commit3ffca8f9e8c58be945f0c9f63755c0aa26358a5f
authorBerk Hess <hess@kth.se>
Sun, 4 Sep 2016 16:29:34 +0000 (4 18:29 +0200)
committerBerk Hess <hess@kth.se>
Sun, 4 Sep 2016 16:55:30 +0000 (4 18:55 +0200)
tree12f620e8db4bacc020729b4d7eacd69a8c358fd1
parent5b4c0d0c1b1bf849b055b1cd9a609f5fd3101b45
parent54607077439203f3c7e002530fd714e9910bb171
Merge branch release-2016

Change-Id: I11339f3f6ce583827af85fc8187c4f42ae5a8e52
src/gromacs/mdlib/forcerec.cpp
src/gromacs/mdlib/minimize.cpp
src/programs/mdrun/md.cpp