From: Carl Hetherington Date: Wed, 10 Sep 2014 14:44:31 +0000 (+0100) Subject: Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0 X-Git-Tag: v2.0.48~602 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=b80b1aee7fc6561bc53edb10ee5e37d752db80c3 Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0 --- b80b1aee7fc6561bc53edb10ee5e37d752db80c3