Merge release-4-6 into release-5-0
authorSzilard Pall <pall.szilard@gmail.com>
Thu, 14 May 2015 16:34:14 +0000 (18:34 +0200)
committerSzilard Pall <pall.szilard@gmail.com>
Thu, 14 May 2015 16:35:08 +0000 (18:35 +0200)
commite7608eec962fedc0d70447689743adc11bd27de8
tree78d26866510603d9d395a9f794d08be831c059ba
parent9422594755d77feb64f5384990ba707b43b06438
parent56a67d7cce2acc2feee9b7fe3c7e503010f5032b
Merge release-4-6 into release-5-0

Change-Id: Ieb8813f1c9def6d9f232c54adebb56f2081020df
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu