From: Carl Hetherington Date: Thu, 10 Sep 2015 08:54:06 +0000 (+0100) Subject: Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0 X-Git-Tag: v2.1.61~2 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=0f808c885d010958ff8f1bfefc168d2e5d338a12 Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0 --- 0f808c885d010958ff8f1bfefc168d2e5d338a12