From: Roland Schulz Date: Thu, 15 Nov 2018 04:43:48 +0000 (-0800) Subject: Merge release-2019 into master X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=0ca6e2bb2d90958145f6e42e50dac26d4334f2cb;p=alexxy%2Fgromacs.git Merge release-2019 into master Trivial conflicts in: cmake/gmxVersionInfo.cmake src/gromacs/listed-forces/manage-threading.cpp src/gromacs/utility/coolstuff.cpp Change-Id: Ic23b55432a22a4a79da09e72b609615d2b421128 --- 0ca6e2bb2d90958145f6e42e50dac26d4334f2cb diff --cc src/gromacs/utility/coolstuff.cpp index 2c4c1e41eb,e331c0f881..21fc96e7ac --- a/src/gromacs/utility/coolstuff.cpp +++ b/src/gromacs/utility/coolstuff.cpp @@@ -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())