Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Sun, 8 Feb 2015 18:27:19 +0000 (18:27 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 8 Feb 2015 18:27:19 +0000 (18:27 +0000)
commit9d1fb717654dc38e9412d99bb84efdbced2e03ac
tree79ad13dd04cdf7573dcc866aa02eecbd9c043492
parent1022ce41412013512154d2e3530b7cd7ada20d80
parent8bf655a0ce557b017d9ad42f292a6045db4225e0
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0