From: Paul Bauer <paul.bauer.q@gmail.com>
Date: Sat, 30 Nov 2019 10:58:42 +0000 (+0100)
Subject: Merge origin/release-2020 into master
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=6edce54dff1102ed59b8ab1c671b18c1702640bd;p=alexxy%2Fgromacs.git

Merge origin/release-2020 into master

Resolved Conflicts:
	src/gromacs/mdlib/update.cpp
	src/gromacs/mdrun/md.cpp

Change-Id: Ibf1c632cc3096121dccd6c1c1af9bff3d590d18f
---

6edce54dff1102ed59b8ab1c671b18c1702640bd