From: Carl Hetherington Date: Fri, 23 Jan 2015 17:15:18 +0000 (+0000) Subject: Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0 X-Git-Tag: v2.0.48~285 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=f455579f4c2fd2321b2891a03cd9e466b2299148 Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0 --- f455579f4c2fd2321b2891a03cd9e466b2299148