From: Paul Bauer <paul.bauer.q@gmail.com>
Date: Mon, 17 Dec 2018 08:58:48 +0000 (+0100)
Subject: Merge branch release-2018 into release-2019
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=79a1ad23ae8c4f91667fa11fb907ba1e918c99ab;p=alexxy%2Fgromacs.git

Merge branch release-2018 into release-2019

Resolved Conflicts:
	src/gromacs/ewald/pme-solve.cu
	src/gromacs/mdlib/clincs.cpp
	src/programs/mdrun/md.cpp
	src/programs/mdrun/tests/CMakeLists.txt

Change-Id: I813b4ed7ecf8056db09ab749c367a3b5e204e701
---

79a1ad23ae8c4f91667fa11fb907ba1e918c99ab