Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x v2.15.7
authorCarl Hetherington <cth@carlh.net>
Wed, 5 Jun 2019 20:44:29 +0000 (21:44 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 5 Jun 2019 20:44:29 +0000 (21:44 +0100)
commit951d70db4f81b5ddd4093f11853637c8ecbe63c5
tree3d83cd45041c083bdb102ee2d8d05483a5b3d1e0
parent422d7ae041812af3587db6fdbead159672ff2772
parentd699b3514c2c9d9fb32b19f487ad648e6fadb814
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x