Merge branch 'release-5-0'
authorBerk Hess <hess@kth.se>
Wed, 22 Apr 2015 08:57:49 +0000 (10:57 +0200)
committerBerk Hess <hess@kth.se>
Wed, 22 Apr 2015 08:57:49 +0000 (10:57 +0200)
commitbb000dc7ac0066c5037daabe31500b80f90760b7
treed0ac57594e9642d3e747f21a6eea3fe91292f1f8
parentac5c70f0d11e0315e160c66097f7f4224dc2bc4f
parent54ac4012d62bf1a6f725be153346add6573a6402
Merge branch 'release-5-0'

Trivial conflict resolved in runner.cpp.

Change-Id: I5bf8d6672246938f498fff609a7b0943505d2afb
src/gromacs/gmxlib/gmx_cpuid.c
src/gromacs/gmxpreprocess/readir.c
src/gromacs/legacyheaders/gmx_cpuid.h
src/programs/mdrun/runner.cpp