Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Fri, 9 Jan 2015 21:09:54 +0000 (21:09 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 9 Jan 2015 21:09:54 +0000 (21:09 +0000)
commita755eef5a73ba7299198ae4e4c95b88bb9f492ad
treeacc76bc6d650e6d69fa241f83c1f1a9f646d8df6
parent959ced5c835030614042d49afbe49142ef5e6dfe
parentb724f5449a6ebab77b40b9d58cb19060bf408b41
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0