From: Paul Bauer <paul.bauer.q@gmail.com>
Date: Thu, 4 Mar 2021 15:34:41 +0000 (+0100)
Subject: Merge branch release-2020 into merge-2020-into-2021
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=874b87aba0ac3c64e16fff76703f009fc652d6f2;p=alexxy%2Fgromacs.git

Merge branch release-2020 into merge-2020-into-2021

Resolved Conflicts:
	cmake/gmxVersionInfo.cmake
	src/gromacs/gmxpreprocess/readir.cpp
---

874b87aba0ac3c64e16fff76703f009fc652d6f2