Merge branch origin/release-5-0
authorMark Abraham <mark.j.abraham@gmail.com>
Sat, 16 May 2015 17:06:44 +0000 (19:06 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Sun, 17 May 2015 14:24:06 +0000 (16:24 +0200)
commit33ce12bb5a06d250713abd906df672cc265bc0fa
tree99f600fbf8a3bb67baa1adbf4f367d9559ab6a71
parentb0b95f77e10bc3ad5e3ae39a6418f8191fac6e8f
parentb48587d01cf3ad411b7b79eb4281bb0f8bf1c987
Merge branch origin/release-5-0

Conflicts:
CMakeLists.txt
Bumps to version information not needed in master branch,
so not added.

docs/install-guide/install-guide.md
Incorporated new docs for static binaries

docs/old-html/online/mdp_opt.html
Incorporated new docs for soft-core

src/external/boost/README
Incorporated new hint about compiler warnings to
suppress if ever bundling an updated version of Boost
smart pointers.

src/external/gmock-1.7.0/CMakeLists.txt
Incorporated new machinery for suppressing
no-unused-variable GCC 5 warnings in GMock source.

src/gromacs/gmxpreprocess/grompp.c
Recent bug fix in t_state touched same lines as
changes in master branch to remove file type TPX
and the need to pass a parameter to a pull-start
function, so made both changes together.

tests/CMakeLists.txt
Changes to the developer-download of regressiontests
and the way that is implemented touched adjacent lines,
so made both changes together.

Change-Id: I8fb94c3a55893f6bc76d7cf6f33378f94cacf618
13 files changed:
CMakeLists.txt
cmake/gmxManageSharedLibraries.cmake
docs/install-guide/index.rst
docs/manual/forcefield.tex
docs/user-guide/mdp-options.rst
src/external/boost/README
src/external/gmock-1.7.0/CMakeLists.txt
src/gromacs/gmxana/gmx_covar.c
src/gromacs/gmxlib/typedefs.c
src/gromacs/gmxpreprocess/grompp.c
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu
src/testutils/TestMacros.cmake
tests/CMakeLists.txt