Merge release-5-0 into release-5-1
authorMark Abraham <mark.j.abraham@gmail.com>
Wed, 3 Feb 2016 12:06:25 +0000 (13:06 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Wed, 3 Feb 2016 12:06:25 +0000 (13:06 +0100)
commite91f58c98d9ceea6cee3f1834869edc07ab6c6b8
treee60fdc6c6ae35792fd9e0738d05e8871be2019c5
parentaa0fd0f3270fa27d7399b6185c4b56fc0f5b27a4
parent414747c947e130ac0dc58f0a587a95016dcf2e5d
Merge release-5-0 into release-5-1

Change-Id: I12e0bd25b9b114d0977401e8032078d7cfdd78cf
src/gromacs/mdlib/nbnxn_search.c
src/gromacs/mdlib/stat.cpp