Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Wed, 9 Sep 2015 23:12:16 +0000 (00:12 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 9 Sep 2015 23:12:16 +0000 (00:12 +0100)
commitbf3561e1f773345e3c835e9b4cb3dcb103e564cf
tree99e0be18c0cf37532cee872d0a914d77366d2913
parent24b8387a5eb85a72e62eaa88cdca0c516d2db69f
parent99ef355c635fbf5f580972d0aa90e12a17143044
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0