Merge branch release-2018 into release-2019
authorPaul Bauer <paul.bauer.q@gmail.com>
Mon, 17 Dec 2018 08:58:48 +0000 (09:58 +0100)
committerPaul Bauer <paul.bauer.q@gmail.com>
Mon, 17 Dec 2018 08:58:48 +0000 (09:58 +0100)
commit79a1ad23ae8c4f91667fa11fb907ba1e918c99ab
tree579321f8d9f47c185e80a8378c09f316d1c26907
parent63694227d0c8ddfbc0b858d9158f1311bc425e72
parent230258223124fdb3d903016be5c3b1400b5574dc
Merge branch release-2018 into release-2019

Resolved Conflicts:
src/gromacs/ewald/pme-solve.cu
src/gromacs/mdlib/clincs.cpp
src/programs/mdrun/md.cpp
src/programs/mdrun/tests/CMakeLists.txt

Change-Id: I813b4ed7ecf8056db09ab749c367a3b5e204e701