Merge branch 'master' into cairocanvas

This commit is contained in:
Paul Davis 2013-04-26 14:20:11 -04:00
commit 54bf06e63c
13 changed files with 224 additions and 20 deletions

View file

@ -309,7 +309,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
void goto_editor_window ();
void goto_mixer_window ();
void toggle_mixer_window ();
void toggle_mixer_on_top ();
void toggle_editor_mixer ();
int setup_windows ();
void setup_transport ();