diff options
| author | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2014-05-19 20:54:36 +0100 |
|---|---|---|
| committer | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2014-05-19 20:54:36 +0100 |
| commit | 5399425f534e2d96d07cf29f427bfa0f39d904b7 (patch) | |
| tree | b2134c0b8e624b9df89904b942909ea3a688c563 /libs/ardour/wscript | |
| parent | 529a31bde7d17cade6c942e11e098f2c37d984a3 (diff) | |
| parent | c464feb6aa96226856305531fedb8fba2e06689e (diff) | |
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
Diffstat (limited to 'libs/ardour/wscript')
| -rw-r--r-- | libs/ardour/wscript | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 4a50064545..85326e98f8 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -194,6 +194,7 @@ libardour_sources = [ 'sndfile_helpers.cc', 'sndfileimportable.cc', 'sndfilesource.cc', + 'soundcloud_upload.cc', 'source.cc', 'source_factory.cc', 'speakers.cc', |