From: Carl Hetherington Date: Wed, 26 Aug 2015 09:31:34 +0000 (+0100) Subject: Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0 X-Git-Tag: v2.1.47~29 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=519a08e3bb2834b272f59199ae7116c242b0aa30 Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0 --- 519a08e3bb2834b272f59199ae7116c242b0aa30