Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
authorCarl Hetherington <cth@carlh.net>
Thu, 3 Oct 2019 23:22:36 +0000 (01:22 +0200)
committerCarl Hetherington <cth@carlh.net>
Thu, 3 Oct 2019 23:22:36 +0000 (01:22 +0200)
commit4e2623fc99af76b2335d439319acfccface0449c
treea4e7e787919ba2eb2eb840f9fc27376c40e27b00
parent85db4f084dd10beed99de9bf65889995997b8285
parentc701c9276b25ab8267f4cefe21a4303a3a54a372
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x