Merge branch release-4-6
authorMark Abraham <mark.j.abraham@gmail.com>
Wed, 25 Sep 2013 09:16:18 +0000 (11:16 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Thu, 26 Sep 2013 15:48:11 +0000 (17:48 +0200)
commitffbffe8d9b43b9f2b00bab1ad0ed4188b4b100a1
treec645a0e6812588aa29b425f675d32d712f12cd9e
parent931740740c62c9f6499aedd892c0651f3c82f1b1
parent94e69be7bf0d3f6bbf1d8e247f1e566b6149e780
Merge branch release-4-6

Conflicts:
src/gromacs/gmxlib/bondfree.c
src/gromacs/legacyheaders/bondf.h
src/gromacs/legacyheaders/pme.h
src/gromacs/mdlib/pme.c
src/programs/mdrun/runner.c

Conflicts all resolved in favour of release-4-6 branch,
except where the master-branch removal of unused parameters
was correct.

Change-Id: Ib32a52b97b5443b86b4f0e4d575767990dc6c47e
12 files changed:
src/gromacs/gmxana/gmx_tune_pme.c
src/gromacs/gmxlib/bondfree.c
src/gromacs/legacyheaders/bondf.h
src/gromacs/legacyheaders/gmx_simd_macros.h
src/gromacs/legacyheaders/gmx_simd_math_single.h
src/gromacs/legacyheaders/pme.h
src/gromacs/legacyheaders/types/idef.h
src/gromacs/mdlib/domdec.c
src/gromacs/mdlib/minimize.c
src/gromacs/mdlib/pme.c
src/programs/mdrun/md.c
src/programs/mdrun/runner.c