Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
authorCarl Hetherington <cth@carlh.net>
Tue, 23 Jul 2019 20:31:33 +0000 (21:31 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 23 Jul 2019 20:31:33 +0000 (21:31 +0100)
commit64a5419b16d676d48f36b4699cfe83a91ec78549
tree53153a2205abbbcf5cc31c129a03da59313037fd
parentbf19399f8c009ff211d5c7b45b0941417d963c4e
parentc574db0a559fd200179c485509d15fd63c2fa51d
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x