Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x v2.15.29
authorCarl Hetherington <cth@carlh.net>
Mon, 4 Nov 2019 21:05:24 +0000 (22:05 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 4 Nov 2019 21:05:24 +0000 (22:05 +0100)
commit09c0b4dc1566f11f35ec05be415be1b95bd9976c
tree68c045159aac1b77ef49ee5f5c45c3aac32f7980
parent052ec34bd487a3645013e87a7062738284d050df
parent79313d6246007e3dc38d0638aff979421f3f7917
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x