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)
Change-Id: Ifc6c3180fe5803bc9a23a0be84be7c93ecb7f472

1  2 
src/gromacs/mdlib/nbnxn_search.c

Simple merge