Merge release-5-0 into master
authorRoland Schulz <roland@utk.edu>
Wed, 16 Apr 2014 15:07:10 +0000 (11:07 -0400)
committerRoland Schulz <roland@utk.edu>
Wed, 16 Apr 2014 19:43:29 +0000 (15:43 -0400)
commit49b7171504906ac62c0d404183881a2b1e674888
treef7a1c8d30e595c4ebbe7c2abae7229b473ded3e2
parentdccc54d4444042baa179deda7112be0858e47a96
parent843062dbc825596ef07779abc347e33f007c0744
Merge release-5-0 into master

Conflicts:
CMakeLists.txt

Change-Id: Id9bdc4de634a67c4060bec0e5edf4c358cc6a228
CMakeLists.txt
src/gromacs/fileio/confio.c
src/gromacs/gmxana/gmx_chi.c
src/gromacs/gmxana/gmx_tune_pme.c
src/gromacs/gmxlib/nonbonded/nonbonded.c
src/gromacs/mdlib/domdec.c
src/gromacs/mdlib/minimize.c
src/gromacs/mdlib/ns.c
src/programs/view/view.cpp