Merge release-2019 branch into master

author Szilárd Páll <pall.szilard@gmail.com>

Tue, 18 Dec 2018 16:30:28 +0000 (17:30 +0100)

committer Szilárd Páll <pall.szilard@gmail.com>

Tue, 18 Dec 2018 22:48:53 +0000 (23:48 +0100)
author Szilárd Páll <pall.szilard@gmail.com>
Tue, 18 Dec 2018 16:30:28 +0000 (17:30 +0100)
committer Szilárd Páll <pall.szilard@gmail.com>
Tue, 18 Dec 2018 22:48:53 +0000 (23:48 +0100)
diff --cc docs/CMakeLists.txt
Simple merge
diff --cc src/api/cpp/context.cpp
Simple merge
diff --cc src/gromacs/mdlib/forcerec.cpp
Simple merge
diff --cc src/gromacs/mdrun/md.cpp
Simple merge
diff --cc src/gromacs/pulling/pull.cpp
Simple merge
author	Szilárd Páll <pall.szilard@gmail.com>
	Tue, 18 Dec 2018 16:30:28 +0000 (17:30 +0100)
committer	Szilárd Páll <pall.szilard@gmail.com>
	Tue, 18 Dec 2018 22:48:53 +0000 (23:48 +0100)
		1	2
docs/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/api/cpp/context.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/forcerec.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdrun/md.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/gromacs/pulling/pull.cpp	patch \|	diff1 \|	diff2 \|	blob \| history