Merge branch 'release-4-6' into release-5-0
authorMark Abraham <mark.j.abraham@gmail.com>
Thu, 10 Apr 2014 16:40:29 +0000 (18:40 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Thu, 10 Apr 2014 16:43:20 +0000 (18:43 +0200)
commit62254da47de067f4139362f79dcc954ce3a0dc3c
treeac2dd004913553cfc0b615be0e124cc3d28b9ce8
parentbc23720592b366e797fc945232718e2818ff9cb9
parent3e90ae6393b86d19090ff986d06c09d9aed6441f
Merge branch 'release-4-6' into release-5-0

Change-Id: Icd1eafab98512328523a3ea788626b3fb415b0a8
src/gromacs/gmxana/gmx_tune_pme.c
src/gromacs/gmxlib/nonbonded/nonbonded.c
src/gromacs/mdlib/domdec.c
src/gromacs/mdlib/domdec_setup.c
src/gromacs/mdlib/ns.c