Colin Fletcher 5399425f53 Merge branch 'export-dialog' into cairocanvas ... Fix merge conflicts in: gtk2_ardour/export_range_markers_dialog.cc gtk2_ardour/wscript libs/ardour/ardour/export_handler.h libs/ardour/system_exec.cc libs/pbd/pbd/system_exec.h libs/pbd/system_exec.cc		2014-05-19 20:54:36 +01:00
..
CD (Red Book).format
CD + DVD-A.preset
CD + FLAC (tagged).preset
CD + FLAC.preset
CD + Ogg_Vorbis (tagged).preset
CD + Ogg_Vorbis + FLAC (tagged).preset
CD + Ogg_Vorbis.preset
CD only.preset
DVD-A only.preset
DVD-A.format
FLAC 24 bit .format
FLAC 24 bit (tagged).format
FLAC (tagged).preset
FLAC.preset
Ogg_Vorbis .preset
Ogg_Vorbis (tagged).format
Ogg_Vorbis (tagged).preset
Ogg_Vorbis + FLAC (tagged).preset
Ogg_Vorbis + FLAC.preset
Ogg_Vorbis.format
Ring Tone.format
Soundcloud upload (lossless).format
Soundcloud upload (lossy).format
wscript