From: Mark Abraham <mark.j.abraham@gmail.com>
Date: Tue, 9 Jan 2018 07:42:07 +0000 (+0100)
Subject: Merge branch release-2016 into release-2018
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=9c6a7b39062ef2e5825ba522d50ce943c7039445;p=alexxy%2Fgromacs.git

Merge branch release-2016 into release-2018

Change-Id: I22d5b28794a4bbb3b122af339a282695aa64f266
---

9c6a7b39062ef2e5825ba522d50ce943c7039445
diff --cc src/gromacs/domdec/domdec_box.cpp
index 43baf19953,62fc9e2cb2..257ceaec64
--- a/src/gromacs/domdec/domdec_box.cpp
+++ b/src/gromacs/domdec/domdec_box.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-  * Copyright (c) 2009,2010,2014,2015,2017, by the GROMACS development team, led by
 - * Copyright (c) 2009,2010,2014,2015,2018, by the GROMACS development team, led by
++ * Copyright (c) 2009,2010,2014,2015,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.