Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Sun, 10 May 2015 02:23:22 +0000 (03:23 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 10 May 2015 02:23:22 +0000 (03:23 +0100)
1  2 
wscript

diff --cc wscript
Simple merge