Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Wed, 9 Sep 2015 21:00:09 +0000 (22:00 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 9 Sep 2015 21:00:09 +0000 (22:00 +0100)
commit43494601da412259814fdb1345950329cc4aa849
tree4c7d5fb8038998753862bab0b7192109786996de
parent70aaee5bb3fd57ae749357b72f7afb655fd643e6
parentcb3d1d6eda4c798263e86c60c571fbfbeb025acd
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0