Merge branch release-5-1 into release-2016
authorBerk Hess <hess@kth.se>
Fri, 2 Sep 2016 15:28:25 +0000 (17:28 +0200)
committerBerk Hess <hess@kth.se>
Fri, 2 Sep 2016 15:28:25 +0000 (17:28 +0200)
commit54607077439203f3c7e002530fd714e9910bb171
tree47aef100ebc4d2515b77a273c071bfb798389915
parentcfd74c5e8272a3bba1a8b74d2e453bb6b1e614b4
parent971d66c191bc74a912f956a914363e4820b371ce
Merge branch release-5-1 into release-2016

Change-Id: Ia1a7fad67f0ff11175ea24c46f813a445cd49ed6
src/gromacs/domdec/domdec_topology.cpp
src/gromacs/ewald/long-range-correction.cpp
src/gromacs/ewald/long-range-correction.h
src/gromacs/mdlib/force.cpp
src/gromacs/mdlib/forcerec.cpp
src/gromacs/mdlib/minimize.cpp
src/gromacs/mdlib/update.cpp
src/gromacs/mdtypes/forcerec.h
src/programs/mdrun/md.cpp