Merge release-4-6 into master
authorRoland Schulz <roland@utk.edu>
Wed, 30 Oct 2013 03:03:45 +0000 (23:03 -0400)
committerRoland Schulz <roland@utk.edu>
Wed, 30 Oct 2013 03:04:44 +0000 (23:04 -0400)
commit2b30ccba8bdf935f0baf080b9ce21b306600fc84
treee0ed5cf6b056f9ec693a594d7b68177e123259d3
parentf737f3833121537286eb1a0d38244b816b523df2
parent93a3bc696acab4cae3e04f15ac091b465ca7f588
Merge release-4-6 into master

Change-Id: I584e5fb2d70e90e5ac8a1439268ee185b0a4105f
src/gromacs/gmxpreprocess/calc_verletbuf.c
src/gromacs/legacyheaders/gmx_simd_ref.h
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils.h
src/programs/mdrun/repl_ex.c
src/programs/mdrun/runner.c