diff options
| author | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2014-01-08 15:14:35 +0000 |
|---|---|---|
| committer | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2014-01-08 15:50:34 +0000 |
| commit | 52003be3695ab703b936163d7284e208790d5363 (patch) | |
| tree | 6804ad19b3ca6afb9edf84ae63307467ad5da384 /export | |
| parent | cac644270a8626904a4a21f527cdcf5083defa60 (diff) | |
| parent | 382eb0fc6842f202901245709534477b90bda461 (diff) | |
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
Diffstat (limited to 'export')
0 files changed, 0 insertions, 0 deletions