Merge changes Idc652236,If03cf569 into release-4-6
authorRoland Schulz <roland@rschulz.eu>
Wed, 19 Dec 2012 13:49:59 +0000 (14:49 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Wed, 19 Dec 2012 13:49:59 +0000 (14:49 +0100)
commit94f89ef3dfc9928e86834d56d49d0d7e9863b71b
tree28fd0e1ec3472956e554fa6966518adce35a19fa
parentd7e658f873be4291e10b622c2c87ab498479a87e
parent6dfb0604e8393749fc4385110c3aae569bbb4726
Merge changes Idc652236,If03cf569 into release-4-6

* changes:
  renamed gmx_x86_simd_macros.h to gmx_simd_macros.h
  implemented nbnxn AVX-256 2x(N+N) kernels