Merge release-2019 into master
authorRoland Schulz <roland.schulz@intel.com>
Thu, 15 Nov 2018 04:43:48 +0000 (20:43 -0800)
committerPaul Bauer <paul.bauer.q@gmail.com>
Fri, 16 Nov 2018 15:15:48 +0000 (16:15 +0100)
Trivial conflicts in:
cmake/gmxVersionInfo.cmake
src/gromacs/listed-forces/manage-threading.cpp
src/gromacs/utility/coolstuff.cpp

Change-Id: Ic23b55432a22a4a79da09e72b609615d2b421128

1  2 
cmake/gmxVersionInfo.cmake
docs/CMakeLists.txt
docs/release-notes/2019/major/deprecated-functionality.rst
src/gromacs/mimic/MimicCommunicator.cpp
src/gromacs/utility/coolstuff.cpp

Simple merge
Simple merge
index 2c4c1e41ebde441393dc6badd7648b8e7e5ae7c3,e331c0f8811e50f543d5e542c1240c57a8116a45..21fc96e7ac9c1779bcc80d67a61e4599629278f0
@@@ -814,7 -814,8 +814,9 @@@ std::string getCoolQuote(
          { "Why would the backup server database get corrupted anyway?", "Stefan Fleischmann -- system administrator, physicist, optimist." },
          { "Teaching quantum computing is like teaching computer science at Hogwarts.", "Thomas Sterling, ISC2018 keynote" },
          { "It is unfortunate that the authors did not make better use of all the electric power energy that went into these massive computations.", "An anonymous referee" },
 +        { "Doctor, doctor, it hurts when I hit myself in the head with the hammer! - So don't do it!", "Bjarne Stroustrup at CppCon2015" },
+         { "This is extremely unlikely.", "Berk Hess" },
+         { "Nothing is more anarchic than power.", "Pier Paolo Pasolini" },
      };
  
      if (beCool())