Merge release-5-0 into master
authorRoland Schulz <roland@utk.edu>
Sun, 21 Sep 2014 17:38:26 +0000 (13:38 -0400)
committerRoland Schulz <roland@utk.edu>
Sun, 21 Sep 2014 17:38:26 +0000 (13:38 -0400)
commit982993423b348095df0e550ec9d7e6163a270b4f
treea086a3b4ae6fc8d89d76fab197ea743cbce3a8a0
parent80c60b9374efdb883ac53877746348a0531f0ea5
parent28bb38b9b5c10bff38e5e2fe0cd2b0c00433b382
Merge release-5-0 into master

Conflicts:
src/gromacs/CMakeLists.txt (adjacent changes)

Change-Id: I6e5b35508b3f6f6d805a2a539e49decdef28012b
cmake/gmxManageSharedLibraries.cmake
cmake/gmxTestSimd.cmake
src/gromacs/CMakeLists.txt
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu