Merge branch release-4-6 into release-5-0
authorMark Abraham <mark.j.abraham@gmail.com>
Thu, 28 Aug 2014 14:22:11 +0000 (16:22 +0200)
committerRoland Schulz <roland@utk.edu>
Fri, 29 Aug 2014 04:13:44 +0000 (00:13 -0400)
commit5db68fedba9034570121a6950e9dca88ec14ba4a
treefa04e0a63f18838e5d5cda856a9a0136ad81d12b
parent839b4f6ce0f8544c90ca7cf74b35e0ab12fe9596
parent6ba80a267eaf246b7be6fb126d2f300322e95835
Merge branch release-4-6 into release-5-0

Conflicts:
src/gromacs/fileio/gmxfio.c
Used new release-4-6 code calling renamed md5 functions

src/gromacs/gmxana/gmx_covar.c
Used gmx_ffclose, not ffclose, for file opened with xvgropen.

Change-Id: If6f9cb61bf7eab06dfdc61a03ad89ed38d599382
src/gromacs/gmxana/gmx_covar.c
src/gromacs/legacyheaders/vsite.h
src/gromacs/mdlib/domdec.c
src/gromacs/mdlib/pme.c
src/gromacs/mdlib/vsite.c