Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x v2.15.31
authorCarl Hetherington <cth@carlh.net>
Fri, 8 Nov 2019 22:55:34 +0000 (23:55 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 8 Nov 2019 22:55:34 +0000 (23:55 +0100)
commit81fa6ec113fdcfce04aa4a2972cdef19ee038155
tree80ba6d96423459871e7d56f2912a626a577ee395
parent7e355e7f3518eddbf544f299e9e4ab9c9cf482ac
parentee0f2219f3799881bc9f5060edd2ceeecff4217d
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x