Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 6 Nov 2014 22:45:34 +0000 (22:45 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 6 Nov 2014 22:45:34 +0000 (22:45 +0000)
commit009e4abb14cfcaecc0de8fab179adc7bd5feffd4
tree00b746d18fa37e7b21e467faf093eb30d3c37280
parente744c96579c26b1be53e1ae2080144d19fb21997
parent2734637c959928a7d412c709cc3433357418ae03
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0