Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Fri, 17 Jul 2015 00:10:51 +0000 (01:10 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 17 Jul 2015 00:10:51 +0000 (01:10 +0100)
commit2ea0c399252c52b39fba8446a604b12ef218f8da
treebd6a630b2e6c3e5c01ac2019f5b16a435b592c27
parent40246384a15369438f6da66c88dea175307ee038
parent755566efb6d40306675136f98721b5ad004f1188
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0