Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
authorCarl Hetherington <cth@carlh.net>
Fri, 24 Apr 2020 14:18:37 +0000 (16:18 +0200)
committerCarl Hetherington <cth@carlh.net>
Fri, 24 Apr 2020 14:18:37 +0000 (16:18 +0200)
commit90b78d5477e4ca51b96cd22e7e81de50da486132
tree9fe7b74a3b1d584f3011eb87596ea67abb8973d0
parent357d55e1561c7c3b3fc31e645ad445c7e9398a7d
parentc3cf916c147f91f5952cba77a293aa989d6e0af7
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x