From: Roland Schulz Date: Tue, 3 Jun 2014 15:06:20 +0000 (-0400) Subject: Merge release-5-0 into master X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=c21e1898c538a86bcad28d7c587908196d29c96f;p=alexxy%2Fgromacs.git Merge release-5-0 into master Conflicts: share/top/gurgle.dat Change-Id: I95bb9d2ce43ed7fdfe6cfd535e4f88fac9dfb5ea --- c21e1898c538a86bcad28d7c587908196d29c96f diff --cc share/top/gurgle.dat index 9e997a1d98,22cea81563..1f5aa7406c --- a/share/top/gurgle.dat +++ b/share/top/gurgle.dat @@@ -1,4 -1,4 +1,4 @@@ - 399 -401 ++402 If You Want Something Done You Have to Do It Yourself_(Highlander II) I Live the Life They Wish They Did_(Tricky) Jesus Built My Hotrod_(Ministry) @@@ -397,4 -397,6 +397,7 @@@ Restraint! What possible restraint?_(Jo It was something to at least have a choice of nightmares_(Joseph Conrad) You fight, work, sweat, nearly kill yourself, sometimes you do kill yourself, trying to accomplish something - and you can't._(Joseph Conrad) And after some more talk we agreed that the wisdom of rats had been grossly overrated, being in fact no greater than that of men_(Joseph Conrad) +It's an easy game, just don't let the ball past!_(Szilard Pall) + The soul? There's nothing but chemistry here_(Breaking Bad) + You got one part of that wrong. This is not meth._(Breaking Bad) + It's easy to remember: a half a kT is equal to five fourths of a kJ/mol._(Anders Gabrielsson)