Merge branch '1.0' into 1.0-generated-control
[dcpomatic.git] / waf
2012-07-14 Carl HetheringtonMove things round a bit.