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

1  2 
src/gromacs/mdlib/forcerec.cpp
src/gromacs/mdlib/minimize.cpp
src/programs/mdrun/md.cpp

Simple merge
Simple merge
Simple merge