Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
authorCarl Hetherington <cth@carlh.net>
Tue, 3 Dec 2019 10:21:43 +0000 (11:21 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 3 Dec 2019 10:21:43 +0000 (11:21 +0100)
commit8587a7420141a37c548b66f5383296eb5631c89d
tree78a1327dba409379107a3cae48f7ba2f0ab6fdee
parent480b9827e33c315aff7ea92e30d7b9a050e8a1b5
parentd366e853399d3247077aa1a04d8b6d6ef38c7cfc
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x