Merge branch 'v2.15.x' of ssh://localhost:2222/home/carl/git/dcpomatic into v2.15.x
authorCarl Hetherington <cth@carlh.net>
Mon, 14 Oct 2019 09:24:48 +0000 (11:24 +0200)
committerCarl Hetherington <cth@carlh.net>
Mon, 14 Oct 2019 09:24:48 +0000 (11:24 +0200)
commit96f7dd41a2c8627bc1ea0d24d84142eb04b4ffef
tree27c4f6a5355a0496e960e1769632d00c41ad4816
parent95bd2d068f67f7c0e611c720c95bfd6781329d86
parenta9dde34b8772ef8b985af067e2ff709be4e3cab6
Merge branch 'v2.15.x' of ssh://localhost:2222/home/carl/git/dcpomatic into v2.15.x