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

24 KiB

Raw Blame History

View Raw