Merge branch 'export-dialog' into cairocanvas
authorColin Fletcher <colin.m.fletcher@googlemail.com>
Mon, 19 May 2014 19:54:36 +0000 (20:54 +0100)
committerColin Fletcher <colin.m.fletcher@googlemail.com>
Mon, 19 May 2014 19:54:36 +0000 (20:54 +0100)
commit5399425f534e2d96d07cf29f427bfa0f39d904b7
treeb2134c0b8e624b9df89904b942909ea3a688c563
parent529a31bde7d17cade6c942e11e098f2c37d984a3
parentc464feb6aa96226856305531fedb8fba2e06689e
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
13 files changed:
gtk2_ardour/export_channel_selector.h
gtk2_ardour/export_dialog.cc
gtk2_ardour/export_format_dialog.h
gtk2_ardour/export_timespan_selector.cc
gtk2_ardour/export_timespan_selector.h
gtk2_ardour/wscript
libs/ardour/ardour/export_format_manager.h
libs/ardour/ardour/export_format_specification.h
libs/ardour/ardour/export_handler.h
libs/ardour/export_handler.cc
libs/ardour/wscript
libs/pbd/pbd/system_exec.h
libs/pbd/system_exec.cc