Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Sat, 5 Sep 2015 22:22:20 +0000 (23:22 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 5 Sep 2015 22:22:20 +0000 (23:22 +0100)
commit33e36553d1dfe3bc7f143e559d754fbc678e043d
tree9d60ded0f50e26852b780480969ff955e1c97a03
parentab437f4e90be4ba8bce5922250c023422497c70d
parent04f81090142b617e6cc2213de39407feba6cdf51
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
wscript