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 /gtk2_ardour/export_channel_selector.h | |
| 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 'gtk2_ardour/export_channel_selector.h')
| -rw-r--r-- | gtk2_ardour/export_channel_selector.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk2_ardour/export_channel_selector.h b/gtk2_ardour/export_channel_selector.h index bc165273c7..3dbb9b8265 100644 --- a/gtk2_ardour/export_channel_selector.h +++ b/gtk2_ardour/export_channel_selector.h @@ -126,7 +126,7 @@ class PortExportChannelSelector : public ExportChannelSelector typedef Gtk::TreeModelColumn<Glib::RefPtr<Gtk::ListStore> > ComboCol; ComboCol port_list_col; - /* Channel struct, that represents the selected port and it's name */ + /* Channel struct, that represents the selected port and its name */ struct Channel { public: |