Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Sun, 10 May 2015 10:40:17 +0000 (11:40 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 10 May 2015 10:40:17 +0000 (11:40 +0100)
commit6a1e0e49f2fa2e978cf766e395125e06a10d3c55
treec3adedc343e2fce4a13fde65f60251dc0a142703
parentbce51f69e4c4839f3e63f21b783c6a6fcd0ba4ae
parent57875ffdd1f9d67ed1b91ae8155d612aaa8caf6f
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0