merge with master and fix 4 conflicts by hand

[ardour.git] / libs / surfaces / control_protocol / control_protocol / basic_ui.h

diff --git a/libs/surfaces/control_protocol/control_protocol/basic_ui.h b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
index 180688e61603dc747c2194bd5fe1aa2c65f7eb6b..277a7f8ecdc505e2679c8ebfb26898a2270988af 100644 (file)
--- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h
+++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
@@ -28,8 +28,6 @@
 
 #include "ardour/types.h"
 
-#include <jack/types.h>
-
 #include "timecode/time.h"
 
 #include "control_protocol/visibility.h"