Merge master.
[dcpomatic.git] / src / lib / compose.hpp
2012-10-03 Carl HetheringtonMerge.
2012-10-02 Carl HetheringtonMerge branch 'resample-drop-frame'
2012-10-02 Carl HetheringtonTidy up timing code a bit.