Merge remote-tracking branch 'origin/master' into 2.0
[dcpomatic.git] / src / lib / video_content_scale.cc
2014-09-09 Carl HetheringtonMerge remote-tracking branch 'origin/master' into 2.0
2014-09-09 Carl HetheringtonMerge master.
2014-09-08 Carl HetheringtonMerge master.
2014-09-07 Carl HetheringtonMove VideoContentScale to its own file.