Merge release-5-0 into master
authorRoland Schulz <roland@utk.edu>
Sat, 10 May 2014 16:34:36 +0000 (12:34 -0400)
committerRoland Schulz <roland@utk.edu>
Sat, 10 May 2014 16:34:36 +0000 (12:34 -0400)
commitd4312782e36029db9f85c438719296158c89dd83
treebce8827c764f80a7634410d9b5e7eff2718170e5
parent5936e000c5c29a42e712e7b802f82b310f23ece4
parent73eb6fd38236ec350495096244e82ca44f873561
Merge release-5-0 into master

Change-Id: Ib309c33a5923d50757122b789df9430aaa1ee98d
20 files changed:
src/gromacs/fileio/libxdrf.c
src/gromacs/fileio/tngio.cpp
src/gromacs/gmxana/geminate.c
src/gromacs/gmxana/gmx_anaeig.c
src/gromacs/gmxana/gmx_current.c
src/gromacs/gmxana/gmx_mindist.c
src/gromacs/gmxana/gmx_rms.c
src/gromacs/gmxana/gmx_rmsdist.c
src/gromacs/gmxana/gmx_xpm2ps.c
src/gromacs/gmxlib/gmx_detect_hardware.c
src/gromacs/gmxlib/nonbonded/nb_free_energy.c
src/gromacs/gmxpreprocess/readir.c
src/gromacs/gmxpreprocess/resall.c
src/gromacs/mdlib/coupling.c
src/gromacs/mdlib/domdec.c
src/gromacs/mdlib/domdec_setup.c
src/gromacs/mdlib/nbnxn_search.c
src/gromacs/mdlib/pme.c
src/gromacs/mdlib/qmmm.c
src/gromacs/utility/cstringutil.c