Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Fri, 7 Nov 2014 22:33:52 +0000 (22:33 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 7 Nov 2014 22:33:52 +0000 (22:33 +0000)
commit985a83ffbf251db481150221914ef74fbfe549b2
tree5de2be442f41d3117102011c4ef92e375b0f0e25
parent8e4f48a96af091e7d90387aa027d65ac285a8201
parent87da92b45a9a0cf4ce809ea580a78c4dd5d96021
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0