Merge branch release-5-0

Change-Id: Ice890f6d9b0235bc2f07e5c73ee2264a32f18a86

diff --cc CMakeLists.txt
index abc899722eb5b874dd1dfbd711f6a6a44e03a67f,4a2650bb7d30b93a4d78c55870ca0880d01f54a6..79e7f1ef2fa0c4f11af6ac40d0c554c2e100cf24
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -513,13 -613,12 +517,6 @@@ if (GMX_BUILD_UNITTESTS AND NOT HAVE_LI
          "Either set GMX_BUILD_UNITTESTS=OFF or tell CMake how to find a working version of libxml2.")
  endif()
  
- if(GMX_USE_TNG AND NOT GMX_EXTERNAL_TNG)
-     # TNG wants zlib if it is available
-     find_package(ZLIB QUIET)
-     include(gmxTestZLib)
-     gmx_test_zlib(HAVE_ZLIB)
- endif()
 -########################################################################
 -# Generate development version info for cache
 -########################################################################
 -# set(GEN_VERSION_INFO_INTERNAL "ON")
 -# include(gmxGenerateVersionString)
--
  ########################################################################
  # Our own GROMACS tests
  ########################################################################

diff --cc cmake/gmxTestCXX11.cmake
Simple merge

diff --cc docs/manual/forcefield.tex
Simple merge

diff --cc src/gromacs/gmxana/gmx_hbond.c
Simple merge

diff --cc src/gromacs/gmxlib/txtdump.c
Simple merge

diff --cc src/gromacs/gmxpreprocess/toputil.c
Simple merge

diff --cc src/gromacs/mdlib/coupling.cpp
Simple merge