Merge release-4-6 into release-5-0
authorMark Abraham <mark.j.abraham@gmail.com>
Mon, 29 Jun 2015 14:43:51 +0000 (16:43 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Mon, 29 Jun 2015 18:22:35 +0000 (20:22 +0200)
commit0f4c0a07259f64b9782c463357d5d50d8a16043f
tree32911e4bad2726efbdd740a7f56b27757ca867fa
parent910e8ed9da1da34c31d822c26d041e8cfa990e83
parent92d9b39b7ac25613052a6ba178d513dd142151ac
Merge release-4-6 into release-5-0

Conflicts:

  src/gmxlib/nonbonded/nb_free_energy.c
Deleted - change already exists in release-5-0

  src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu
Applied same reordering to the (unchanged) release-5-0 code

  src/mdlib/nbnxn_cuda/nbnxn_cuda_types.h
Renamed misc_ops_and_local_H2D_done, and added Doxygen for it

Change-Id: I4c34d168af347a59b7821da6fea71a4715ec5bae
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_types.h