Merge master into direct-mxf.
[dcpomatic.git] / src / lib / timer.cc
2012-07-14 Carl HetheringtonMove things round a bit.