Merge release-4-6 into release-5-0
authorMark Abraham <mark.j.abraham@gmail.com>
Fri, 26 Jun 2015 07:06:01 +0000 (09:06 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Fri, 26 Jun 2015 08:50:08 +0000 (10:50 +0200)
commit5718497524bf836bc6835e056651e6390c297725
treec68b892c0b4fb64f0501b2b18757aa0465593aac
parent368bdf6154423ed6e9ece5bf9866d28727b3d0b8
parente639c5ffb785af3e3c03dfffc85cc2137f0b4758
Merge release-4-6 into release-5-0

Conflicts:
src/gromacs/fileio/strdb.c
src/gromacs/utility/cstringutil.c
These were not actually conflicts; the code changed here was simply
relocated in release-5-0.

src/programs/mdrun/md.c
Trajectory-writing code has moved in release-5-0, so applied some
changes to src/gromacs/fileio/trajectory_writing.c

Uncrustified, copyright bumps.

Change-Id: I11626cbf2a3efa89adf7c975df2a43b4eb3680fb
src/gromacs/fileio/strdb.c
src/gromacs/fileio/trajectory_writing.c
src/gromacs/gmxlib/checkpoint.c
src/gromacs/utility/cstringutil.c
src/programs/mdrun/md.c