From: Carl Hetherington Date: Mon, 1 Jun 2015 22:42:57 +0000 (+0100) Subject: Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0 X-Git-Tag: v2.0.48~28 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=e12d6f79ca85a71d30abbd3c167a0747b2ae5bb1 Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0 --- e12d6f79ca85a71d30abbd3c167a0747b2ae5bb1