Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
authorCarl Hetherington <cth@carlh.net>
Mon, 3 Aug 2020 07:16:27 +0000 (09:16 +0200)
committerCarl Hetherington <cth@carlh.net>
Mon, 3 Aug 2020 07:16:27 +0000 (09:16 +0200)
commit5254047c3ad8c8c4b7ed7bf5b735b8448fcf1c29
tree21671f3baaa1db61e20e22906ad071b987b615bd
parent061466f78357b15ad39f699b1f03c9c4fa35954e
parent591c73b472f0eb74225dbc1b08885f552b8814c4
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x