Merge "Merge branch 'release-4-6'"

author Roland Schulz <roland@rschulz.eu>

Mon, 2 Dec 2013 20:23:31 +0000 (21:23 +0100)

committer Gerrit Code Review <gerrit@gerrit.gromacs.org>

Mon, 2 Dec 2013 20:23:31 +0000 (21:23 +0100)
author Roland Schulz <roland@rschulz.eu>
Mon, 2 Dec 2013 20:23:31 +0000 (21:23 +0100)
committer Gerrit Code Review <gerrit@gerrit.gromacs.org>
Mon, 2 Dec 2013 20:23:31 +0000 (21:23 +0100)
diff --cc src/gromacs/mdlib/domdec.c
Simple merge
diff --cc src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h
Simple merge
diff --cc src/programs/mdrun/runner.c
Simple merge
author	Roland Schulz <roland@rschulz.eu>
	Mon, 2 Dec 2013 20:23:31 +0000 (21:23 +0100)
committer	Gerrit Code Review <gerrit@gerrit.gromacs.org>
	Mon, 2 Dec 2013 20:23:31 +0000 (21:23 +0100)
		1	2
src/gromacs/mdlib/domdec.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/runner.c	patch \|	diff1 \|	diff2 \|	blob \| history