Merge branch release-2018
authorMark Abraham <mark.j.abraham@gmail.com>
Tue, 6 Mar 2018 14:07:45 +0000 (15:07 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Tue, 6 Mar 2018 14:14:39 +0000 (15:14 +0100)
commit45257cb20bae28480a11e59f015ff84ddeb7d427
treee6644da13847e4641d493152a19c9efc8310f322
parent0748b1a99786294ca67f89fd140f170d91c400e6
parent33093601ff229ed8c8a40e73866a7ff351e8963b
Merge branch release-2018

Minor conflicts from separation of multisim from commrec,
and code movement in constraints code.

Change-Id: Id1fea8a7de0726e34eb2d43b2420b4753631f303
src/gromacs/awh/awh.cpp
src/gromacs/hardware/cpuinfo.cpp
src/gromacs/hardware/cpuinfo.h
src/gromacs/mdlib/forcerec.cpp
src/gromacs/mdlib/shake.cpp
src/gromacs/mdlib/shake.h
src/gromacs/mdlib/tpi.cpp
src/gromacs/utility/binaryinformation.cpp
src/programs/mdrun/runner.cpp