Merge release-5-0 into master
authorMark Abraham <mark.j.abraham@gmail.com>
Fri, 26 Jun 2015 12:53:15 +0000 (14:53 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Sat, 27 Jun 2015 06:49:20 +0000 (08:49 +0200)
commit794a34147418e0d851d54061622500ed57136d60
treed145322b15d157e636e4d74abdd1ff1d949cfa0e
parent1d8a2f3db227b3d9f6880dfce9a3e21a75ec44f5
parent5148ccdcc6dc76fa0d10e1fd9c6797be53c553e2
Merge release-5-0 into master

Conflicts:
src/gromacs/mdlib/calc_verletbuf.c
Included nbnxn_simd.h, consistent with fix incoming from release-5-0.

src/programs/mdrun/runner.cpp
One of the changes in release-5-0 was in the -testverlet feature,
which has been removed in master. Other changes applied normally.

Change-Id: Id5b507bce1d6f907e97ac694f02fbe7e486f6208
src/gromacs/fileio/strdb.c
src/gromacs/fileio/trajectory_writing.c
src/gromacs/gmxana/gmx_energy.c
src/gromacs/gmxlib/checkpoint.cpp
src/gromacs/gmxpreprocess/grompp.c
src/gromacs/mdlib/calc_verletbuf.c
src/gromacs/mdlib/calc_verletbuf.h
src/gromacs/utility/cstringutil.c
src/gromacs/utility/cstringutil.h
src/programs/mdrun/md.cpp
src/programs/mdrun/runner.cpp