Merge "Merge branch 'release-4-6'"
authorRoland Schulz <roland@rschulz.eu>
Mon, 2 Dec 2013 20:23:31 +0000 (21:23 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Mon, 2 Dec 2013 20:23:31 +0000 (21:23 +0100)
commit5b996fa8d04a046edcc0c8c414956952da159e6c
tree931445e066fe90b51f1dcf97eb72779c10c75690
parent1c4ab8dc85d1b81954671d9d0071d8f84e026aff
parent69ed86b6b6ee0d3271440a584af3d9c5c827af97
Merge "Merge branch 'release-4-6'"
src/gromacs/mdlib/domdec.c
src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h
src/programs/mdrun/runner.c