Merge branch 'release-4-6'
authorMark Abraham <mark.j.abraham@gmail.com>
Mon, 2 Dec 2013 15:01:51 +0000 (16:01 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Mon, 2 Dec 2013 15:01:51 +0000 (16:01 +0100)
commit69ed86b6b6ee0d3271440a584af3d9c5c827af97
tree6b15d0278cdbd3d5db65ad8af470ac8c041a862b
parent2f14f66839a2541b439ab2c5a2876128e0a505a0
parent99f228b04707e025a0fd60518c575c1e974ed162
Merge branch 'release-4-6'

Conflicts:
src/gromacs/legacyheaders/topsort.h
Resolved in favour of comment change in release-4-6

Change-Id: Ib930277635cdd260c136ab9b3e02809682587252
admin/installguide/installguide.tex
src/gromacs/gmxlib/gpu_utils/gpu_utils.cu
src/gromacs/gmxlib/topsort.c
src/gromacs/legacyheaders/topsort.h
src/gromacs/mdlib/domdec.c
src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h
src/programs/mdrun/runner.c