Merge release-5-0 into master
authorRoland Schulz <roland@utk.edu>
Thu, 31 Jul 2014 16:23:51 +0000 (12:23 -0400)
committerRoland Schulz <roland@utk.edu>
Thu, 31 Jul 2014 16:26:23 +0000 (12:26 -0400)
commitad2081e78f41fcbe63e948b9a8302381503834d3
treedbc15fedce89b2de4e23dcdf13795e42d8877f2a
parent178c8db507cf9133965c59714132d59ec635c3a9
parentc929b623469f26e9519059e2cde445f9bb3cfc49
Merge release-5-0 into master

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