Conflicted merge from upstream/develop

2023-02-08 13:58:25 +00:00
parent c5e944d73d 51629dba24
commit e26b934233
12 changed files with 1157 additions and 926 deletions
--- a/host_usb_mixer_control/mixer_app.cpp
+++ b/host_usb_mixer_control/mixer_app.cpp
@@ -1,5 +1,6 @@
 // Copyright 2022-2023 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>