Conflicted merge

CHANGELOG.rst

@@ -4,9 +4,9 @@ lib_xua Change Log
 UNRELEASED
 ----------
 
-  * FIXED:     Memory corruption during initialisation of mixer weights
+  * FIXED:     Memory corruption due to erroneous initialisation of mixer weights when not in use (#152) 
   * FIXED:     UserHostActive() not being called as expected (#326)
-  * FIXED;     Exception when entering DSD mode
+  * FIXED:     Exception when entering DSD mode
 
 3.4.0
 -----

Jenkinsfile

@@ -1,4 +1,4 @@
-@Library('xmos_jenkins_shared_library@v0.21.0') _
+@Library('xmos_jenkins_shared_library@v0.24.0') _
 
 getApproval()
 
@@ -145,10 +145,14 @@ pipeline {
             dir("${REPO}") {
               checkout scm
               dir("${REPO}/host/xmosdfu") {
-                runVS('nmake /f Makefile.Win32')
+                withVS("vcvars32.bat") {
+                  bat "nmake /f Makefile.Win32"
+                }
               }
               dir("host_usb_mixer_control") {
-                  runVS('msbuild host_usb_mixer_control.vcxproj /property:Configuration=Release /property:Platform=x64')
+                  withVS() {
+                    bat 'msbuild host_usb_mixer_control.vcxproj /property:Configuration=Release /property:Platform=x64'
+                  }
                   sh 'mkdir Win/x64'
                   sh 'mv bin/Release/x64/host_usb_mixer_control.exe Win/x64/xmos_mixer.exe'
                   archiveArtifacts artifacts: "Win/x64/xmos_mixer.exe", fingerprint: true

lib_xua/module_build_info

@@ -13,7 +13,7 @@ DEPENDENT_MODULES = lib_locks(>=2.1.0) \
                     lib_mic_array(>=4.5.0) \
                     lib_spdif(>=4.2.1) \
                     lib_xassert(>=4.1.0) \
-                    lib_xud(>=2.2.2) \
+                    lib_xud(>=2.2.3) \
                     lib_adat(>=1.0.0)
 
 MODULE_XCC_FLAGS = $(XCC_FLAGS) \