Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x v2.15.25
authorCarl Hetherington <cth@carlh.net>
Mon, 21 Oct 2019 16:42:03 +0000 (18:42 +0200)
committerCarl Hetherington <cth@carlh.net>
Mon, 21 Oct 2019 16:42:03 +0000 (18:42 +0200)
commitf37e6b5a0f320d4352b87b97f78afae762512b93
tree354a5a8b3882f69fa3de3fed175b30576c58bf6b
parent231644e75f537342c3442c03a3cd5ef34bfa25ec
parentdfd42d2a546d14c32057a34002543877ea2f99cb
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x