Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Wed, 1 Oct 2014 21:52:08 +0000 (22:52 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 1 Oct 2014 21:52:08 +0000 (22:52 +0100)
1  2 
wscript

diff --cc wscript
Simple merge