Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
authorCarl Hetherington <cth@carlh.net>
Wed, 19 Feb 2020 19:13:53 +0000 (20:13 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 19 Feb 2020 19:13:53 +0000 (20:13 +0100)
commit0b15f493754d1b630338b17f2a6dfc66ccc4f6b7
treee241af5b39696e7b2b7e46344b604efc7e959a2b
parent61efbb1cfe73c2a41896e60a8a335457e30674d1
parent1679c3dc40262733f46dda9f4151367bf93f2b76
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x