From: Carl Hetherington Date: Mon, 14 Oct 2019 09:24:48 +0000 (+0200) Subject: Merge branch 'v2.15.x' of ssh://localhost:2222/home/carl/git/dcpomatic into v2.15.x X-Git-Tag: v2.15.23~4 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=96f7dd41a2c8627bc1ea0d24d84142eb04b4ffef Merge branch 'v2.15.x' of ssh://localhost:2222/home/carl/git/dcpomatic into v2.15.x --- 96f7dd41a2c8627bc1ea0d24d84142eb04b4ffef