Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Sun, 21 Dec 2014 03:05:06 +0000 (03:05 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 21 Dec 2014 03:05:06 +0000 (03:05 +0000)
commit456967a554cc29fda50ef0c6267a3b823592f366
treea130d40bffb1afc1a4528b31ee94431c661323c5
parent9ff6697a545bd98ea8820a45e3f6bb5b55495634
parent7106334071bc2a44b2cb4f27a19052ce78806b77
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0