Public Git Hosting - gromacs.git/commit

Merge branch 'release-5-0'

Trivial conflict resolved in runner.cpp.

Change-Id: I5bf8d6672246938f498fff609a7b0943505d2afb

src/gromacs/gmxlib/gmx_cpuid.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/readir.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/gmx_cpuid.h	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/runner.cpp	diff1 \|	\|	blob \| history

The ultimate molecular dynamics simulation package

src/gromacs/gmxlib/gmx_cpuid.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/readir.c	diff1 \|	diff2 \|	blob \| history
src/gromacs/legacyheaders/gmx_cpuid.h	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/runner.cpp	diff1 \|	\|	blob \| history