Merge branch release-5-1
authorMark Abraham <mark.j.abraham@gmail.com>
Fri, 19 Feb 2016 09:18:47 +0000 (10:18 +0100)
committerBerk Hess <hess@kth.se>
Fri, 19 Feb 2016 11:01:24 +0000 (12:01 +0100)
commitbcb1cd438273af954d00f342d22318aac079d6b7
tree7d1525bcd052d0e925a0d52ea2eaa3192fe3594c
parentf480aaf11d99ad7bd8fbd341444041ddf7666fe8
parentad7759024a41137f1f39e4e369a75545ba1223a0
Merge branch release-5-1

Change-Id: I8935d1351656d6b0888e923c8316fce5d5c27cde
docs/manual/forcefield.tex
src/gromacs/gmxpreprocess/toppush.cpp
src/gromacs/mdlib/forcerec.cpp
src/gromacs/mdlib/nbnxn_search.cpp
src/gromacs/mdlib/tgroup.cpp
src/gromacs/tools/compare.cpp