Merge branch release-2019 into release-2020
authorMark Abraham <mark.j.abraham@gmail.com>
Fri, 29 Nov 2019 12:52:13 +0000 (13:52 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Fri, 29 Nov 2019 12:56:44 +0000 (13:56 +0100)
commit475b9a11a7bcc07d3cb20cd5d49e76ec538c9a2a
tree77361d0da171a179a493230c72d2376d9c16cc7a
parentefdcedae48816b799db84286f8fa1c852ffc35a7
parent6dd2746df3fdaa99e73ecc0785f576bbd23c30fe
Merge branch release-2019 into release-2020

Change-Id: I138d910b0d5cb8555460f87345c4e312e528a3ce
docs/user-guide/mdp-options.rst
src/gromacs/awh/biasparams.h
src/gromacs/awh/read_params.cpp
src/gromacs/fileio/pdbio.cpp
src/gromacs/pulling/pull.cpp