Merge branch 'release-2019' into master
authorPaul Bauer <paul.bauer.q@gmail.com>
Mon, 28 Oct 2019 15:37:37 +0000 (16:37 +0100)
committerPaul Bauer <paul.bauer.q@gmail.com>
Tue, 29 Oct 2019 11:34:12 +0000 (12:34 +0100)
commit506a55bfac650f7a6d9982a2d86252c4d79e9710
tree8bafbf791c0daced6339bb011a84fe2e8ff5af1b
parent6d5d8b6322ed80f01f98eedf16306a95a9fc49b8
parentc26b330ae0623d5eaec52675ab74526e8b40644d
Merge branch 'release-2019' into master

Updated reference data that needed updating.

Resolved Conflicts:
cmake/gmxVersionInfo.cmake
docs/CMakeLists.txt
src/gromacs/ewald/pme-gpu-types-host.h
src/gromacs/ewald/pme-only.cpp
src/gromacs/gmxana/gmx_make_ndx.cpp
src/gromacs/mdlib/nbnxn_gpu_common.h
src/gromacs/mdrun/md.cpp
src/programs/mdrun/tests/minimize.cpp

Change-Id: Ic5aeae6bf932d190b95366373b64ee3449f4a630
docs/CMakeLists.txt
docs/release-notes/index.rst
src/gromacs/gmxana/gmx_wham.cpp
src/gromacs/mdlib/mdebin_bar.cpp
src/gromacs/mdrun/md.cpp
src/gromacs/tools/make_ndx.cpp
src/programs/mdrun/tests/refdata/Angles1_SimpleMdrunTest_WithinTolerances_0.xml