From: Carl Hetherington Date: Mon, 6 Jul 2015 19:42:12 +0000 (+0100) Subject: Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0 X-Git-Tag: v2.1.19~5 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=43877eccbedc0950ab253e76dd0cea691fd7a4b0 Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0 --- 43877eccbedc0950ab253e76dd0cea691fd7a4b0