Merge branch 'v2.15.x' of ssh://localhost:2222/home/carl/git/dcpomatic into v2.15.x

author Carl Hetherington <cth@carlh.net>

Mon, 21 Oct 2019 15:25:16 +0000 (17:25 +0200)

committer Carl Hetherington <cth@carlh.net>

Mon, 21 Oct 2019 15:25:16 +0000 (17:25 +0200)
author Carl Hetherington <cth@carlh.net>
Mon, 21 Oct 2019 15:25:16 +0000 (17:25 +0200)
committer Carl Hetherington <cth@carlh.net>
Mon, 21 Oct 2019 15:25:16 +0000 (17:25 +0200)
diff --cc src/lib/util.cc
Simple merge
diff --cc test/test.cc
Simple merge
author	Carl Hetherington <cth@carlh.net>
	Mon, 21 Oct 2019 15:25:16 +0000 (17:25 +0200)
committer	Carl Hetherington <cth@carlh.net>
	Mon, 21 Oct 2019 15:25:16 +0000 (17:25 +0200)
		1	2
src/lib/util.cc	patch \|	diff1 \|	diff2 \|	blob \| history
test/test.cc	patch \|	diff1 \|	diff2 \|	blob \| history