Merge branch 'master' into cairocanvas

This commit is contained in:
Paul Davis 2013-07-09 09:11:52 -04:00
commit 38f2aa51bd
20 changed files with 135 additions and 66 deletions

View file

@ -199,7 +199,7 @@ MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt)
v->pack_start (*manage (new Label ("")), true, true);
v->show ();
h->show ();
controls_hbox.pack_start(*v);
controls_hbox.pack_start(*v, false, false);
controls_ebox.set_name ("MidiTrackControlsBaseUnselected");
controls_base_selected_name = "MidiTrackControlsBaseSelected";