Merge 'release-4-6' into master
[alexxy/gromacs.git] / src / gromacs / mdlib / nbnxn_internal.h