Merge master.
[dcpomatic.git] / src / lib / image_subtitle.h
2014-08-11 Carl HetheringtonMerge master.
2014-08-06 Carl HetheringtonMerge master.
2014-07-17 Carl HetheringtonMerge master.
2014-07-16 Carl HetheringtonMerge master.
2014-07-16 Carl HetheringtonMerge remote-tracking branch 'origin/master' into 1.0
2014-07-16 Carl HetheringtonMerge master.
2014-07-16 Carl HetheringtonMerge remote-tracking branch 'origin/master' into 2.0
2014-07-16 Carl HetheringtonMerge master.
2014-07-10 Carl HetheringtonMerge master.
2014-07-08 Carl HetheringtonMerge master.
2014-07-04 Carl HetheringtonMake XML subtitle work at the very minimal level.
2014-07-02 Carl HetheringtonRearrange Player subtitle handling a bit.