Merge release-4-6 into master
authorRoland Schulz <roland@utk.edu>
Sun, 2 Feb 2014 22:30:03 +0000 (17:30 -0500)
committerRoland Schulz <roland@utk.edu>
Sun, 2 Feb 2014 22:30:49 +0000 (17:30 -0500)
commit243b20cd74c54cad7beb3bbeff876f7c6a0bcd51
tree07eb47a2b891442fe5f3b17ef23afb84afa66801
parentfdaf4c434caba2085d121c528018f33dee5bf8a3
parent049b8574b450eb7f2bc7131d7dabe98af64594dc
Merge release-4-6 into master

Conflicts (only Copyright header):
src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h

Change-Id: I0c9b713d95343c13fa6e3154b8d08a9ca43e7363
src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_outer.h