Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Fri, 7 Nov 2014 13:35:34 +0000 (13:35 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 7 Nov 2014 13:35:34 +0000 (13:35 +0000)
commit6c9cbc74a656257e5cd7f1901439dd22256faf96
tree1ae338b70be364decc13fd451548459a04b3e43e
parent8b4a53492c593fe5777138da781579ce9bc6e154
parent330903522f2454744f2c45ae2fd255d120b2a102
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0