Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Fri, 21 Aug 2015 07:09:19 +0000 (08:09 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 21 Aug 2015 07:09:19 +0000 (08:09 +0100)
commit012ad9a456d1c87d0916f448e3183ba3bb2e85cd
treea5a6305b58803c74559170bb38641546d34392ee
parent044c9a8aefe1713e116e866e3735345366929f7b
parent1a0b4b5e84a35b367471f1226576b6f1006e45f5
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0