Merge branch 'v2.12.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.12.x
authorCarl Hetherington <cth@carlh.net>
Tue, 25 Sep 2018 21:07:03 +0000 (22:07 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 25 Sep 2018 21:07:03 +0000 (22:07 +0100)
commitfbd1df602623aab2c873c4dc1fb96a09b1b2dac3
treebe001ee40ed38672e75938aa90e3c4e54f278de9
parent044cde1e20270618b9156d68cba8b3d5558a30ce
parentf1342d3ce448dbeb7a51f10739f5f1c0b54a44a1
Merge branch 'v2.12.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.12.x