Merged with trunk revision 610

git-svn-id: svn://localhost/ardour2/branches/midi@611 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-15 22:31:13 +00:00
parent b5db1f624d
commit e13e84677a
31 changed files with 545 additions and 1980 deletions
--- a/libs/surfaces/control_protocol/control_protocol.cc
+++ b/libs/surfaces/control_protocol/control_protocol.cc
@@ -23,7 +23,7 @@
 #include <ardour/route.h>
 #include <ardour/audio_track.h>

-#include "control_protocol.h"
+#include <control_protocol/control_protocol.h>

 using namespace ARDOUR;
 using namespace std;