From: Carl Hetherington Date: Mon, 21 Oct 2019 16:42:03 +0000 (+0200) Subject: Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x X-Git-Tag: v2.15.25 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=f37e6b5a0f320d4352b87b97f78afae762512b93 Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x --- f37e6b5a0f320d4352b87b97f78afae762512b93