Merge branch release-2018 into release-2019
authorPaul Bauer <paul.bauer.q@gmail.com>
Fri, 14 Jun 2019 04:54:44 +0000 (06:54 +0200)
committerPaul Bauer <paul.bauer.q@gmail.com>
Fri, 14 Jun 2019 10:03:20 +0000 (12:03 +0200)
commit3b807e8e47be8be03ca90c9b5da6c7c43a78060a
tree610487d1f4455f06350f3f29511a6d3e7bc5305a
parentceb70742a3f3d6c23ccfa7f1fcf4d91bba497732
parent94c67da644f93ad19d42c2ba18fde6f212a08f22
Merge branch release-2018 into release-2019

Change-Id: I50c1c93898246a8cbb9198227e1e77d483393bab
docs/CMakeLists.txt
docs/release-notes/index.rst
src/gromacs/mdlib/nbnxn_search.cpp