merge with master

This commit is contained in:
Paul Davis 2013-05-08 14:48:28 -04:00
commit bebe2af95a
36 changed files with 563 additions and 318 deletions

View file

@ -37,7 +37,6 @@
#include "gtkmm2ext/dndtreeview.h"
#include "gtkmm2ext/stateful_button.h"
#include "gtkmm2ext/bindings.h"
#include "gtkmm2ext/visibility_tracker.h"
#include "pbd/stateful.h"
#include "pbd/signals.h"
@ -126,7 +125,7 @@ class TimeSelection;
class RegionLayeringOrderEditor;
class VerboseCursor;
class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr, public Gtkmm2ext::VisibilityTracker
class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
{
public:
Editor ();