merge with master and fix 4 conflicts by hand
[ardour.git] / libs / surfaces / control_protocol /
drwxr-xr-x   ..
drwxr-xr-x - MSVCardour_cp
-rw-r--r-- 8448 basic_ui.cc
-rw-r--r-- 7432 control_protocol.cc
drwxr-xr-x - control_protocol
-rw-r--r-- 1376 wscript