From: Carl Hetherington Date: Mon, 13 Jul 2015 23:29:28 +0000 (+0100) Subject: Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0 X-Git-Tag: v2.1.21~2 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=a6a4671df0a6405f1ec8b03eebab90f55c909625 Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0 --- a6a4671df0a6405f1ec8b03eebab90f55c909625