Hand-apply 62f8054d65a8bd31689fc0c977c1bb2385e71afa from master; config of encryption...
[dcpomatic.git] / src / wx / timeline_subtitle_content_view.h
2015-02-19 Carl HetheringtonMerge branch '2.0' of ssh://main.carlh.net/home/carl...
2015-02-19 Carl HetheringtonSplit up Timeline view classes.