Merge branch 'master' of git.carlh.net:git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Thu, 16 Oct 2014 09:39:31 +0000 (10:39 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 16 Oct 2014 09:39:31 +0000 (10:39 +0100)
1  2 
wscript

diff --cc wscript
Simple merge