Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Wed, 10 Sep 2014 14:44:31 +0000 (15:44 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 10 Sep 2014 14:44:31 +0000 (15:44 +0100)
commitb80b1aee7fc6561bc53edb10ee5e37d752db80c3
tree6a9bf8dfdd3160b9a127ec5c70396c315d595e05
parentf4030653da8f5a0b3daebe640f485b3daf9ef091
parent1108e627939999667f0955921d582736a6ffb13b
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0