Merge release-4-6 into release-5-0
authorRoland Schulz <roland@utk.edu>
Wed, 8 Jul 2015 07:28:27 +0000 (03:28 -0400)
committerRoland Schulz <roland@utk.edu>
Wed, 8 Jul 2015 07:29:52 +0000 (03:29 -0400)
commit29ac4fea30657750f0b89b919698b1ca48e49b65
tree779acf6f823f0b7ae7bce3175bfa36986cff7dba
parent37956400be5c77267d602ca97052c52648e04c6c
parenteea54d018709cb37261a071db80775e189337748
Merge release-4-6 into release-5-0

Change-Id: I25fea1226adfaa332c5c7b0630e99031266178f4
src/gromacs/mdlib/nbnxn_search.c