From: Carl Hetherington Date: Sat, 5 Sep 2015 22:22:20 +0000 (+0100) Subject: Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0 X-Git-Tag: v2.1.55~1 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=33e36553d1dfe3bc7f143e559d754fbc678e043d Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0 --- 33e36553d1dfe3bc7f143e559d754fbc678e043d