Merge branch 'origin/release-2020' into master
authorPaul Bauer <paul.bauer.q@gmail.com>
Sat, 7 Dec 2019 18:02:33 +0000 (19:02 +0100)
committerArtem Zhmurov <zhmurov@gmail.com>
Thu, 12 Dec 2019 14:10:40 +0000 (15:10 +0100)
commit02618a70d0464e222b630cf8fb308bf78b31ebcc
tree9d7a2ff176e333a4003f540e6704cbc2479e28e9
parent0a5f5a08db5f188768155f5e979ec161887e64bd
parentc13f46532b99c2c4651502d509caaedad877469f
Merge branch 'origin/release-2020' into master

Resolved Conflicts:
cmake/gmxVersionInfo.cmake
src/gromacs/mdlib/lincs_cuda.cuh

Change-Id: Ic184065c27cd13c5871db73b3aeed03b76a1f50c
cmake/gmxVersionInfo.cmake
src/gromacs/mdlib/lincs_cuda.cu
src/gromacs/mdlib/lincs_cuda.cuh
src/gromacs/mdlib/update_constrain_cuda_impl.cu
src/gromacs/mdrun/runner.cpp