Colin Fletcher 52003be369 Merge remote-tracking branch 'origin/master' into export-dialog ...

Fix conflicts in:
	gtk2_ardour/export_dialog.cc
	gtk2_ardour/export_dialog.h
	libs/ardour/export_handler.cc

2014-01-08 15:50:34 +00:00

4.4 KiB

Raw Blame History

View Raw