From: Carl Hetherington Date: Wed, 21 Jan 2015 10:19:11 +0000 (+0000) Subject: Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0 X-Git-Tag: v2.0.48~291 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=73ccfce6ef220b1c3a562a0af86edbc435ed8f6a Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0 --- 73ccfce6ef220b1c3a562a0af86edbc435ed8f6a