Merge branch 'dist' of ssh://git.carlh.net/home/carl/git/dcpomatic into dist
authorCarl Hetherington <cth@carlh.net>
Sun, 5 Apr 2020 19:41:23 +0000 (21:41 +0200)
committerCarl Hetherington <cth@carlh.net>
Sun, 5 Apr 2020 19:41:23 +0000 (21:41 +0200)
commitb7f2423efc11ea64cc72b2df833fe73d089112cd
tree085bee65d73a4e441e6f510c2d11c63c2defe39e
parent78c305ddcbea2a467d115773c133a6ed0a33ee1b
parentcd7a4506e70775579e777d9824dda468ada0b04f
Merge branch 'dist' of ssh://git.carlh.net/home/carl/git/dcpomatic into dist