cherry-pick b9708d5f6b, then manually resolve conflicts (thanks git rerere)

This commit is contained in:
harrison 2014-03-23 18:11:42 -05:00 committed by Paul Davis
parent b5222012c0
commit c7d4ce1399
8 changed files with 107 additions and 188 deletions

View file

@ -41,6 +41,7 @@ gtk2_ardour_sources = [
'waves_icon_button.cc',
'ardour_dialog.cc',
'waves_dialog.cc',
'ardour_menu.cc',
'ardour_ui.cc',
'ardour_ui2.cc',
'ardour_ui_dependents.cc',