Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x v2.15.55
authorCarl Hetherington <cth@carlh.net>
Thu, 23 Apr 2020 23:50:54 +0000 (01:50 +0200)
committerCarl Hetherington <cth@carlh.net>
Thu, 23 Apr 2020 23:50:54 +0000 (01:50 +0200)
commitc3cf916c147f91f5952cba77a293aa989d6e0af7
treeb0ace837a20e99ab7660644919edc6fae1368424
parentd07c4241b58fc654cf0331d09d0814b4d6a24743
parent7ccd46e07ef55e60feeb820b7a2164d24bb1e2cd
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x