Merge branch 'release-4-6' into master
authorRoland Schulz <roland@utk.edu>
Thu, 27 Jun 2013 03:34:35 +0000 (23:34 -0400)
committerRoland Schulz <roland@utk.edu>
Thu, 27 Jun 2013 03:34:35 +0000 (23:34 -0400)
commit2398ab23cc07aad54eb1dc601c93d5ef5f221ad1
tree1168e23de07a46ad5e0078182c7b8443c0133f67
parentf0220ab8a2ac5d90f5d34de26b296b91c1bf15f4
parentc6ea5b23cf5221b982a79e61bb46c66acfab638a
Merge branch 'release-4-6' into master

Mostly easy. selhelp.cpp got the fix from selhelp.c

Omitted the content of 34a402e7 (clang-AMD-FMA work-around) in favour
of reworking it for C++ in a child patch

    Conflicts:
        CMakeLists.txt - kept master version number!
        src/gmxlib/selection/selhelp.c - deleted
        src/gromacs/gmxana/pp2shift.h - deleted
        src/gromacs/legacyheaders/pull_rotation.h

Change-Id: Ibf0c9af136e39dfcbef0a85eb7d314740706cb60
21 files changed:
CMakeLists.txt
src/contrib/runner_openmm.c
src/gromacs/gmxana/dlist.c
src/gromacs/gmxana/gmx_chi.c
src/gromacs/gmxana/gmx_gyrate.c
src/gromacs/gmxlib/gmx_thread_affinity.c
src/gromacs/gmxlib/nonbonded/nonbonded.c
src/gromacs/gmxlib/thread_mpi/pthreads.c
src/gromacs/gmxlib/tpxio.c
src/gromacs/legacyheaders/gstat.h
src/gromacs/legacyheaders/nbnxn_cuda_data_mgmt.h
src/gromacs/legacyheaders/pull_rotation.h
src/gromacs/mdlib/expanded.c
src/gromacs/mdlib/force.c
src/gromacs/mdlib/forcerec.c
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu
src/gromacs/mdlib/pull_rotation.c
src/gromacs/mdlib/shakef.c
src/gromacs/selection/selhelp.cpp
src/programs/mdrun/md.c
src/programs/mdrun/runner.c