From: Carl Hetherington Date: Wed, 9 Sep 2015 23:12:16 +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^2 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=bf3561e1f773345e3c835e9b4cb3dcb103e564cf Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0 --- bf3561e1f773345e3c835e9b4cb3dcb103e564cf