Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Sun, 6 Sep 2015 11:57:38 +0000 (12:57 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 6 Sep 2015 11:57:38 +0000 (12:57 +0100)
commit277763fcf8f6d22ed6db25d8621ec03b89cf8229
tree43a4ec330930d6bff986db00ad4f355dc5e366d7
parentd316893518de15a8e02135784e7c6c5e76a98e93
parent0d677d560c1c5de8728869974224111b6c2d4d8c
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0