Merge branch release-2016
authorMark Abraham <mark.j.abraham@gmail.com>
Mon, 31 Oct 2016 11:39:40 +0000 (12:39 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Mon, 31 Oct 2016 11:39:40 +0000 (12:39 +0100)
commit390476555e8be8bdd4aa036d42cdfcf4e7608522
treec52ba8ed0265bd6e59cf26bfa8b4214e2c50182d
parent9d10ffa92642c7849cf295ffb8ce16b219a1df83
parent2ed67b7ac772e8a75cbf0dd7547670d9296bee8e
Merge branch release-2016

Trivial conflicts for version number and the fix for gmx
wham duplicated in each branch.

Change-Id: I0ba030398cc2d3679841000a40db6e8a3f7b68cb
cmake/gmxVersionInfo.cmake
docs/install-guide/index.rst
src/gromacs/domdec/domdec.cpp
src/gromacs/gmxpreprocess/readir.cpp
src/gromacs/mdlib/constr.cpp
src/gromacs/mdlib/sim_util.cpp