From: Roland Schulz <roland.schulz@intel.com>
Date: Fri, 12 Jan 2018 01:58:30 +0000 (-0800)
Subject: Merge release-2018 into master
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=51052df810f16813149e6102046a84a547a796e8;p=alexxy%2Fgromacs.git

Merge release-2018 into master

Change-Id: I197f817d0b54392bc1198536e39e74baacad3e96
---

51052df810f16813149e6102046a84a547a796e8
diff --cc cmake/gmxCPackUtilities.cmake
index 7867998a8a,0388254c83..5a5c267c41
--- a/cmake/gmxCPackUtilities.cmake
+++ b/cmake/gmxCPackUtilities.cmake
@@@ -1,7 -1,7 +1,7 @@@
  #
  # This file is part of the GROMACS molecular simulation package.
  #
- # Copyright (c) 2014,2015,2016, by the GROMACS development team, led by
 -# Copyright (c) 2014,2015,2016,2017, by the GROMACS development team, led by
++# Copyright (c) 2014,2015,2016,2017,2018, 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.