Merge changes I88f0dcef,I86b2a8cf,I70fb7e6d into release-4-6
authorRoland Schulz <roland@rschulz.eu>
Fri, 23 Nov 2012 00:11:14 +0000 (01:11 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Fri, 23 Nov 2012 00:11:14 +0000 (01:11 +0100)
* changes:
  Fix for icc 13 optimization-related issue and TIP4P kernel update.
  Implemented RMS-based force tolerance in gmxcheck
  Fixed LJ-14 error in free energy


Trivial merge