Merge "removed x86 specifics from nbnxn SIMD kernels" into release-4-6
authorMark Abraham <mark.j.abraham@gmail.com>
Fri, 12 Apr 2013 11:46:50 +0000 (13:46 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Fri, 12 Apr 2013 11:46:50 +0000 (13:46 +0200)

Trivial merge