From: Carl Hetherington Date: Mon, 4 Nov 2019 21:05:24 +0000 (+0100) Subject: Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x X-Git-Tag: v2.15.29 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=09c0b4dc1566f11f35ec05be415be1b95bd9976c Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x --- 09c0b4dc1566f11f35ec05be415be1b95bd9976c