Merge branch release-4-6 into release-5-0
authorMark Abraham <mark.j.abraham@gmail.com>
Tue, 29 Apr 2014 20:52:24 +0000 (22:52 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Tue, 29 Apr 2014 21:00:31 +0000 (23:00 +0200)
commit8d18661a4e7e83cbe9a6bc316a309cf453687305
tree6871a1ba8c772407ef2a210003efc72ff7be1156
parent53fc9d0eeb255ca9f17d454bd19445a30675bc33
parent1f8a4f94581bb4ade86901208580bc6f01ee2abe
Merge branch release-4-6 into release-5-0

Conflicts:
src/gromacs/mdlib/coupling.c

Resolved in favour of release-4-6, except that the underlying
RNG calls are now made to the new cycle-based RNG.

Run uncrustify

Change-Id: I56286e19632ac28958a0d4ef60ff09b875aa3005
src/gromacs/fileio/gmxfio_asc.c
src/gromacs/gmxana/gmx_rmsdist.c
src/gromacs/gmxpreprocess/readir.c
src/gromacs/mdlib/coupling.c