From: Carl Hetherington Date: Wed, 5 Aug 2015 17:36:26 +0000 (+0100) Subject: Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0 X-Git-Tag: v2.1.35~1 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=56bc3aa3907594b69a1c6c1cd58213d68657a1ff Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0 --- 56bc3aa3907594b69a1c6c1cd58213d68657a1ff