Merge release-5-0 into master
authorRoland Schulz <roland@utk.edu>
Mon, 28 Jul 2014 17:32:04 +0000 (13:32 -0400)
committerRoland Schulz <roland@utk.edu>
Mon, 28 Jul 2014 18:11:55 +0000 (14:11 -0400)
commitd045cc43f9172bd53777dd600e2f51b750463cd3
tree7ca99d22f7a73f5f6d05cec1ac2e65b44f0583be
parentb93bf468686d5ea0194631026559fad62f565cbe
parentcaad87a3617b2156f408609fab27c4f93917f919
Merge release-5-0 into master

Conflicts:
    src/testutils/refdata.h (trivial)

Manual changes:
    src/external/Random123-1.08/include/Random123/features/compilerfeatures.h
        replaced simple.h with basedefintions.h

Change-Id: I96fbc370b1c6bec101d877b2e3bda1adec56fcb6
CMakeLists.txt
src/external/Random123-1.08/include/Random123/features/compilerfeatures.h
src/gromacs/analysisdata/tests/datatest.h
src/gromacs/commandline/cmdlinehelpmodule.cpp
src/gromacs/commandline/cmdlinemodulemanager.cpp
src/gromacs/fileio/mdoutf.c
src/gromacs/mdlib/forcerec.c
src/gromacs/mdlib/nbnxn_search.c