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)
commit6524aca43a57f673ae9ac7dde8222651d6f96e65
tree98da819723fe7c9436d86512833f93ce14bc56d5
parent6673c0f1ba0d96e21c4a287c30b48e5c4f1d8818
parentf5b0d22554d401917f9305e436baaab3c850766e
Merge changes I88f0dcef,I86b2a8cf,I70fb7e6d into release-4-6

* 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