Merge branch release-2019
authorMark Abraham <mark.j.abraham@gmail.com>
Thu, 22 Aug 2019 19:16:04 +0000 (21:16 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Thu, 22 Aug 2019 19:36:55 +0000 (21:36 +0200)
commitd25d8cbc8ca972974256476d622e4d4c8909fd4e
treef170ff5bbe1c0864da938fa77f1183c25d8c494f
parent1af15f19fab1cf626159ce0133e868906d63578e
parent1706a84488ce15430c77eeb3145c59e50efbde91
Merge branch release-2019

Change-Id: I71b540586e32f54f3536c5a59eb99d89ad0b3639
src/gromacs/gmxana/gmx_disre.cpp
src/gromacs/gpu_utils/cudautils.cuh