From: Roland Schulz <roland.schulz@intel.com>
Date: Wed, 23 Jan 2019 17:23:51 +0000 (-0800)
Subject: Merge release-2019 into master
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=facffbb0c7d5324ff8a106dee0706a0097143839;p=alexxy%2Fgromacs.git

Merge release-2019 into master

Change-Id: I17cea87b19b5350853fdf652539a2f43e6092784
---

facffbb0c7d5324ff8a106dee0706a0097143839
diff --cc cmake/gmxManageLmfit.cmake
index 1217cb9b41,1152d0b8ed..1656feb3c2
--- a/cmake/gmxManageLmfit.cmake
+++ b/cmake/gmxManageLmfit.cmake
@@@ -1,7 -1,7 +1,7 @@@
  #
  # This file is part of the GROMACS molecular simulation package.
  #
--# Copyright (c) 2016,2018, by the GROMACS development team, led by
++# Copyright (c) 2016,2018,2019, by the GROMACS development team, led by
  # Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  # and including many others, as listed in the AUTHORS file in the
  # top-level source directory and at http://www.gromacs.org.