From: Carl Hetherington Date: Sat, 5 Oct 2019 19:27:28 +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.21 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=433bd53a9d8a4a2848ddab3db156576467ac91a5 Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x --- 433bd53a9d8a4a2848ddab3db156576467ac91a5