Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Wed, 26 Aug 2015 09:31:34 +0000 (10:31 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 26 Aug 2015 09:31:34 +0000 (10:31 +0100)
commit519a08e3bb2834b272f59199ae7116c242b0aa30
treea2fc4ec2af55fe4b2e1635a1b174e1483cf798da
parent7b704d7b8e82e8370ed6aea6da7de9ebef7e0ab4
parentd5b1385dd20107faacb9cd301039c449c2e091cd
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0