Merge release-5-0 into master
authorRoland Schulz <roland@utk.edu>
Thu, 12 Feb 2015 18:38:31 +0000 (13:38 -0500)
committerRoland Schulz <roland@utk.edu>
Thu, 12 Feb 2015 18:38:51 +0000 (13:38 -0500)
commita042e92540ec830f13591ebcc49306b9ba1911e0
tree956f45752b426f1048837d2ec28d27e38c6fc38e
parent1e1f18a50ac010fa3c8e1586f63ff9ac9009449d
parentf39f90fab4d4da0c8e17f1fcd9366dd977390e5a
Merge release-5-0 into master

Change-Id: I23579c289b8a057a94cf64b142759934b9402ee5
src/gromacs/ewald/pme.c
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu