Merge "prepared the nbnxn code for non-x86 SIMD" into release-4-6
authorRoland Schulz <roland@rschulz.eu>
Sun, 13 Jan 2013 16:48:27 +0000 (17:48 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Sun, 13 Jan 2013 16:48:27 +0000 (17:48 +0100)

Trivial merge