mirror of
https://github.com/Ardour/ardour.git
synced 2026-01-04 12:45:45 +01:00
merge with master, fixing conflicts in 3 wscript files
This commit is contained in:
commit
2a6a16f980
64 changed files with 4195 additions and 3528 deletions
|
|
@ -156,8 +156,7 @@ class UI : public AbstractUI<UIRequest>
|
|||
stopping just after we return from it (at the top level)
|
||||
*/
|
||||
|
||||
sigc::signal<void> starting;
|
||||
sigc::signal<void> stopping;
|
||||
virtual int starting() = 0;
|
||||
|
||||
sigc::signal<void> theme_changed;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue