merge with master and fix 4 conflicts by hand
[ardour.git] / gtk2_ardour / export_range_markers_dialog.h