Merge branch release-4-6 into release-5-0
authorMark Abraham <mark.j.abraham@gmail.com>
Thu, 27 Nov 2014 17:04:46 +0000 (18:04 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Thu, 27 Nov 2014 17:04:46 +0000 (18:04 +0100)
commit66de73c59e4e8ce70359679cc6aa9a6466aef39f
treecf2dfeb335d7c231419654e715c052b0ff0174ce
parent5012852e7f6a3b7ad84117d69b6a5554c1aee166
parent93a5a180ddb5592cf784077e12d6d8de3b429306
Merge branch release-4-6 into release-5-0

Conflicts:
src/gromacs/gmxpreprocess/readir.c
(added content at same point in both branches)

Change-Id: I9df7cef8c2e4920461fb3d84806c58cf07c645e2
src/gromacs/gmxlib/gmx_thread_affinity.c
src/gromacs/gmxpreprocess/readir.c
src/gromacs/mdlib/domdec.c