Merge release-4-6 into master
authorRoland Schulz <roland@utk.edu>
Mon, 12 Nov 2012 23:45:33 +0000 (18:45 -0500)
committerRoland Schulz <roland@utk.edu>
Mon, 12 Nov 2012 23:45:33 +0000 (18:45 -0500)
commit8fd6330d980518f9ab9e1ee3c52b2da5bc39e1b9
tree56e66640e01e866017b0425dfa2f25de918721f5
parenta18f34a450589ba84733ebf695c9c8979b685a1e
parentf5c1d04b273e4c53e9351f8efc89d160ec37f4d0
Merge release-4-6 into master

Conflicts:
CMakeLists.txt

Change-Id: I42951043675af21763778a3022403166f8cc70e0
CMakeLists.txt
src/config.h.cmakein
src/gromacs/legacyheaders/gmx_math_x86_avx_128_fma_single.h
src/gromacs/mdlib/nbnxn_atomdata.c