Merge branch '2.0' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 27 Feb 2014 12:31:23 +0000 (12:31 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 27 Feb 2014 12:31:23 +0000 (12:31 +0000)
commit298395454530a7bbcd2ea333d57dff8be8468bba
treed95d2208d2b77683d7e9d3a4ae7441ef871e3c90
parente8c1880a2b9a40eb11ee259feee3edd799139a43
parentcc3900735839ff4b0da0c046b5c606c440ba917a
Merge branch '2.0' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic into 2.0