Merge branch 'v2.15.x' of ssh://main.carlh.net/home/carl/git/dcpomatic into v2.15.x
authorCarl Hetherington <cth@carlh.net>
Thu, 10 Oct 2019 18:16:46 +0000 (20:16 +0200)
committerCarl Hetherington <cth@carlh.net>
Thu, 10 Oct 2019 18:16:46 +0000 (20:16 +0200)
commit8775f802d15e19ff9251d0daff49994a0fc145bc
tree5179f01dcfb27ea3427386f392fc302aa84358a7
parentcde792116ecae3d61f9b724fc581fdf82f30a0a9
parentc0a609b31bbf69d1fafcc734ac4f825933703d23
Merge branch 'v2.15.x' of ssh://main.carlh.net/home/carl/git/dcpomatic into v2.15.x