Merge branch release-4-6 into release-5-0
authorMark Abraham <mark.j.abraham@gmail.com>
Thu, 18 Sep 2014 09:53:17 +0000 (11:53 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Thu, 18 Sep 2014 09:53:17 +0000 (11:53 +0200)
commit28bb38b9b5c10bff38e5e2fe0cd2b0c00433b382
treea0fbf5c055a672431b3498cd32b33bf62e6597c6
parent82fdaa94e91c53ad79b8cca936ee35f18732f9cd
parent89fae8d67c27af46c6336e1e6c1716a60b5bf0bf
Merge branch release-4-6 into release-5-0

Conflicts:
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu

Change in release-4-6 was in a function already removed in
release-5-0, so omitted.

Change-Id: I58f745308357211d517ffdb58381ce5fb1a5dceb
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu