From: Paul Bauer <paul.bauer.q@gmail.com>
Date: Tue, 28 Jan 2020 10:11:22 +0000 (+0100)
Subject: Merge branch origin/release-2020 into master
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=e74ff75bf1d0dacb0c7a0f7565dfef5e090af82f;p=alexxy%2Fgromacs.git

Merge branch origin/release-2020 into master

Resolved Conflicts:
	admin/copyright.py
	cmake/gmxCPackUtilities.cmake
	cmake/gmxManageFFTLibraries.cmake
	cmake/gmxManageMPI.cmake
	cmake/gmxTestMPI_IN_PLACE.cmake
	docs/dev-manual/jenkins.rst
	src/gromacs/domdec/domdec.cpp
	src/gromacs/ewald/pme_load_balancing.cpp
	src/gromacs/gmxlib/network.cpp
	src/gromacs/gmxlib/network.h
	src/gromacs/gmxpreprocess/readir.cpp
	src/gromacs/pulling/pullutil.cpp
	src/gromacs/taskassignment/decidegpuusage.cpp
	src/gromacs/topology/mtop_util.cpp
	src/gromacs/topology/mtop_util.h

Change-Id: Ie41c4a18cc79368eba613a093cda9c8782eead2c
---

e74ff75bf1d0dacb0c7a0f7565dfef5e090af82f
diff --cc src/gromacs/gmxpreprocess/readir.cpp
index f4699da88f,a217abfaa9..79a79bbf75
--- a/src/gromacs/gmxpreprocess/readir.cpp
+++ b/src/gromacs/gmxpreprocess/readir.cpp
@@@ -3,7 -3,7 +3,8 @@@
   *
   * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
   * Copyright (c) 2001-2004, The GROMACS development team.
-  * Copyright (c) 2013-2019,2020, by the GROMACS development team, led by
 - * Copyright (c) 2013-2020, by the GROMACS development team, led by
++ * Copyright (c) 2013,2014,2015,2016,2017, The GROMACS development team.
++ * Copyright (c) 2018,2019,2020, 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.
diff --cc src/gromacs/topology/mtop_util.cpp
index 8aee144a46,cead4301b7..6f6a9d64b0
--- a/src/gromacs/topology/mtop_util.cpp
+++ b/src/gromacs/topology/mtop_util.cpp
@@@ -1,8 -1,8 +1,8 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-  * Copyright (c) 2008,2009,2010.
 - * Copyright (c) 2008,2009,2010,
-- * Copyright (c) 2012,2013,2014,2015,2016 by the GROMACS development team.
++ * Copyright (c) 2008,2009,2010, The GROMACS development team.
++ * Copyright (c) 2012,2013,2014,2015,2016 The GROMACS development team.
   * Copyright (c) 2017,2018,2019,2020, 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
diff --cc src/gromacs/utility/coolstuff.cpp
index 5450794ea8,54dbf014b3..feba1cc0fc
--- a/src/gromacs/utility/coolstuff.cpp
+++ b/src/gromacs/utility/coolstuff.cpp
@@@ -1508,13 -1508,8 +1508,13 @@@ std::string getCoolQuote(
            "Mind and Miracle Productions on Twitter, spamming a FEP thread" },
          { "\"A slow sort of country!\" said the Queen. \"Now, HERE, you see, it "
            "takes all the running YOU can do, to keep in the same place. If you want "
-           "to get somewhere else, you must run at least twice as fast as that!\""
+           "to get somewhere else, you must run at least twice as fast as that!\"",
            "Lewis Carroll" },
 +        { "More than 10000000 total errors detected.  I'm not reporting any more. "
 +          "Final error counts will be inaccurate.  Go fix your program!",
 +          "Valgrind while memory debugging mdrun" },
 +        { "If we are going to have SYCL, can we have a hammer as well?", "Joe Jordan" },
 +        { "We can make it into a friend class. But I don't like having friends.", "Joe Jordan" },
      };
  
      if (beCool())