Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x v2.15.21
authorCarl Hetherington <cth@carlh.net>
Sat, 5 Oct 2019 19:27:28 +0000 (21:27 +0200)
committerCarl Hetherington <cth@carlh.net>
Sat, 5 Oct 2019 19:27:28 +0000 (21:27 +0200)
commit433bd53a9d8a4a2848ddab3db156576467ac91a5
treee38cdade765d11174be0e8f9cd9c20123b9c3045
parent2fb0437e57a85edb7324e322e81a21527974c693
parent4e2623fc99af76b2335d439319acfccface0449c
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x