Merge branch release-2016
authorMark Abraham <mark.j.abraham@gmail.com>
Sun, 9 Oct 2016 21:46:47 +0000 (23:46 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Sun, 9 Oct 2016 21:52:57 +0000 (23:52 +0200)
commit033bdf8fa484a32a73ec46dffe7d1e25e561e6ea
treef71b398ba0cac34885690ef811f99f90d0f1cfbb
parentb22c29fa4816a6b44a713a8041c09c9811695565
parentb04a53c49ab4a69dee20c5f3bb3c3e3df06701b9
Merge branch release-2016

Resolutions straightforward apart from the question about the
correctness of the gmx_wham fix in release-2016 branch.

Change-Id: I908a9a6d8f5767da49c3f00495beeec2a4f95ca7
src/gromacs/commandline/cmdlinemodulemanager.cpp
src/gromacs/domdec/domdec.cpp
src/gromacs/gmxana/gmx_wham.cpp
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu