Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 29 Jan 2015 20:30:31 +0000 (20:30 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 29 Jan 2015 20:30:31 +0000 (20:30 +0000)
commitab1eff7e045517bf8377003b1f6dc5ad22b08a5b
treeff74e324036638ab4ada0a65ef7cacd3ddd849b4
parent14b3b9443c1a6eb94d1a7499b68b72eccb615ea6
parentbfe277e664a03ec47cd6bee7e1b1e4aca6eb38e6
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0