Merge branch 'v2.12.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.12.x
authorCarl Hetherington <cth@carlh.net>
Sun, 25 Feb 2018 01:10:38 +0000 (01:10 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 25 Feb 2018 01:10:38 +0000 (01:10 +0000)
commitbab976c6d0aa5a807ff16a3e80d7de2c742feed3
treef5bd1212e5b88d0cfdb3a62bb42740ef3c00f148
parentd7cabb623a5bedb407632557fdc4913d9ed4e1ce
parent014b17da131764016efb35dc2d5131c9656f485c
Merge branch 'v2.12.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.12.x