From: Carl Hetherington Date: Tue, 1 Sep 2015 09:31:21 +0000 (+0100) Subject: Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0 X-Git-Tag: v2.1.50~12 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=b0297f77b23099a52d37becfa45930ee730bda4b Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0 --- b0297f77b23099a52d37becfa45930ee730bda4b