Merge master.
[dcpomatic.git] / src / wx / imagemagick_content_dialog.cc
2013-07-09 Carl HetheringtonMerge master.
2013-06-20 Carl HetheringtonPull some emacs mode lines.
2013-06-15 Carl HetheringtonMerge master.
2013-06-09 Carl HetheringtonMerge.
2013-06-02 Carl HetheringtonMerge master.
2013-05-25 Carl HetheringtonMerge master and multifarious hackery.
2013-05-21 Carl HetheringtonMerge master.
2013-05-21 Carl HetheringtonVarious more hacks; basically trying to remove Regions...
2013-05-09 Carl HetheringtonMerge master.
2013-05-04 Carl HetheringtonAdd FFmpeg content dialog; moving ffmpeg-specific thing...
2013-05-04 Carl HetheringtonMerge master.
2013-04-28 Carl HetheringtonMerge master.
2013-04-26 Carl HetheringtonMerge branch 'master' into 1.0
2013-04-26 Carl HetheringtonMerge master; fix crash on new film.
2013-04-21 Carl HetheringtonUntested merge of master.
2013-04-17 Carl HetheringtonMerge branch 'master' into content-rework-take5
2013-04-17 Carl HetheringtonMerge branch 'master' into content-rework-take5
2013-04-16 Carl HetheringtonMerge master.
2013-04-10 Carl HetheringtonMerge master.
2013-04-09 Carl HetheringtonMerge master.
2013-04-07 Carl HetheringtonMerge master.
2013-04-07 Carl HetheringtonMerge master.
2013-04-06 Carl HetheringtonBasics of content dialogs.