From: Carl Hetherington Date: Sun, 14 Jun 2015 21:07:24 +0000 (+0100) Subject: Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0 X-Git-Tag: v2.1.4~18 X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=b19fed96652628c7d5c397bdc797b8717afeb44b;p=dcpomatic.git Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0 --- b19fed96652628c7d5c397bdc797b8717afeb44b