| commit | e8c6a9b3df55fb67f6b7145ecd17e61f59e1e84c | |
| author | Paul Bauer <paul.bauer.q@gmail.com> | |
| Wed, 21 Nov 2018 09:46:29 +0000 (21 10:46 +0100) | ||
| committer | Paul Bauer <paul.bauer.q@gmail.com> | |
| Wed, 21 Nov 2018 12:06:05 +0000 (21 13:06 +0100) | ||
| tree | 16a22d74911c3c469eadd31598bb4c113aae5d3c | treesnapshot (tar.gz zip) |
| parent | de71ffac62115a3ca4c4f4af1b39e3f5f687f27d | commitdiff |
| parent | e9f6acc2e39cbf8c87bdabcef643822130c7a320 | commitdiff |
Merge branch release-2018 into release-2019
Several changes addressing known issues have not
been brought forward, either because they are
inappropriate or the bug is already fixed in
release-2019 branch.
Resolved Conflicts:
admin/builds/gromacs.py
admin/builds/post-submit-matrix.txt
cmake/gmxVersionInfo.cmake
docs/CMakeLists.txt
src/gromacs/mdlib/minimize.cpp
src/gromacs/mdlib/shellfc.cpp
src/gromacs/topology/mtop_util.cpp
src/programs/mdrun/md.cpp
src/programs/mdrun/mdrun.cpp
src/programs/mdrun/runner.cpp
src/testutils/testinit.cpp
Change-Id: Ia18b43854925fb2c6e1bf4256b99bd8f42359f68
Several changes addressing known issues have not
been brought forward, either because they are
inappropriate or the bug is already fixed in
release-2019 branch.
Resolved Conflicts:
admin/builds/gromacs.py
admin/builds/post-submit-matrix.txt
cmake/gmxVersionInfo.cmake
docs/CMakeLists.txt
src/gromacs/mdlib/minimize.cpp
src/gromacs/mdlib/shellfc.cpp
src/gromacs/topology/mtop_util.cpp
src/programs/mdrun/md.cpp
src/programs/mdrun/mdrun.cpp
src/programs/mdrun/runner.cpp
src/testutils/testinit.cpp
Change-Id: Ia18b43854925fb2c6e1bf4256b99bd8f42359f68
12 files changed: