projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merging from trunk
[ardour.git]
/
libs
/
ardour
/
ardour
/
osc.h
diff --git
a/libs/ardour/ardour/osc.h
b/libs/ardour/ardour/osc.h
index 69ec76eac6ca80b4044a583c3d56a626bce356e0..0a34f44a41bfa35a273b4a25c3031e694ce0a5a9 100644
(file)
--- a/
libs/ardour/ardour/osc.h
+++ b/
libs/ardour/ardour/osc.h
@@
-32,7
+32,7
@@
#include <ardour/types.h>
-#include
"basic_ui.h"
+#include
<control_protocol/basic_ui.h>
namespace ARDOUR {
class Session;