Merge branch release-2016
authorMark Abraham <mark.j.abraham@gmail.com>
Mon, 15 Aug 2016 19:09:04 +0000 (21:09 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Mon, 15 Aug 2016 19:09:04 +0000 (21:09 +0200)
commita2a08c9ba2176a3ab378518e6541911828f01d57
treea032f595d13cfcbb3ad16cd40fdbac205c7c44e3
parentc06840fe4e1caa5e40c8f8e8d236b9720d03b7f2
parentb0848ef68fa0ade8e5f960d533359edf1f724335
Merge branch release-2016

Change-Id: I39dd5524c70707d1784f2814876930c3905a52ba
cmake/gmxVersionInfo.cmake
src/external/gmock-1.7.0/CMakeLists.txt
src/gromacs/mdlib/md_support.cpp
src/gromacs/mdrunutility/threadaffinity.cpp