Merge branch release-2019 into release-2020
authorPaul Bauer <paul.bauer.q@gmail.com>
Fri, 28 Feb 2020 09:56:27 +0000 (10:56 +0100)
committerPaul Bauer <paul.bauer.q@gmail.com>
Fri, 28 Feb 2020 09:56:27 +0000 (10:56 +0100)
commit320b3e1c07ca770674c0bd67939cd275a4f87f18
tree40a64abad870e1525c0e38caa5f7627c6a9a97f5
parentbf9b602a1dc26376f6f3decbb5583898c626296d
parent328a18d71dda42ca67edf76b2f93781dab6fdf9d
Merge branch release-2019 into release-2020

Resolved Conflicts:
cmake/gmxVersionInfo.cmake
src/gromacs/ewald/pme.cpp
src/gromacs/gmxana/gmx_disre.cpp
src/gromacs/gpu_utils/gpu_utils.cu
src/gromacs/hardware/gpu_hw_info.cpp
src/gromacs/hardware/gpu_hw_info.h
src/gromacs/mdrun/rerun.cpp

Change-Id: I2a89270a1321a51e0bc25e2b6890245f562945a2
src/gromacs/ewald/pme.cpp
src/gromacs/gmxana/gmx_disre.cpp
src/gromacs/gpu_utils/gpu_utils.cu
src/gromacs/hardware/gpu_hw_info.cpp
src/gromacs/hardware/gpu_hw_info.h
src/gromacs/mdrun/rerun.cpp