Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
authorCarl Hetherington <cth@carlh.net>
Wed, 11 Mar 2020 20:23:55 +0000 (21:23 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 11 Mar 2020 20:23:55 +0000 (21:23 +0100)
commit755694dd44cf5a012825b8b822da3738461b81ad
treea205e78b204ce220975a75e8a7f777bb78e88a49
parentbb44567d6e77859f54fe30f89426ee337ee69587
parentb24fe6cc8a1e9a980bfd3f6df8476dfa86c3b3a2
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x