# HG changeset patch
# User Chris Cannam
# Date 1454584356 0
# Node ID 545796e9c658084c93e4ec32b16655158130dc3f
# Parent  58ba8c9e7675fc8237641bf9646e4a8ddee57202# Parent  ecb946764afea0669c8195bfdaa39ce7c7d51440
Merge from branch "spectrogram-minor-refactor"

diff -r 58ba8c9e7675 -r 545796e9c658 .hgsubstate
--- a/.hgsubstate	Fri Jan 22 18:12:41 2016 +0000
+++ b/.hgsubstate	Thu Feb 04 11:12:36 2016 +0000
@@ -1,9 +1,9 @@
 b7f9a5c5a607d3672b9ed661f169d838176642d2 bqaudioio
-62c40e7f9231e459091c3352c5d4b6001be127ca bqresample
-94b6ebd5e8ab897e5b294fd77b4113e8d6d78b13 bqvec
+28f51eb8bf2dd985b0c1a6d704fb65e14c2f0f25 bqresample
+a518ddd9dd68917393887d28dfee6221bc37fb66 bqvec
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 68ae618c6b0e442d08a71d39217784a08f2a8de3 icons/scalable
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
 aecd5bdfc71f88429aeb474f8e765d345c4b8dc6 svapp
 2dc27f0f97ad7323557dcb1c717f97feb19e190b svcore
-74755fa6ea9e12df2161de1aa7e5c51eee3022ba svgui
+25b035362c44a4a402db1cc28fee137966cba326 svgui
diff -r 58ba8c9e7675 -r 545796e9c658 bq.pro
--- a/bq.pro	Fri Jan 22 18:12:41 2016 +0000
+++ b/bq.pro	Thu Feb 04 11:12:36 2016 +0000
@@ -32,7 +32,7 @@
         LIBS += -lwinmm -lws2_32
     }
     macx* {
-        DEFINES += HAVE_COREAUDIO
+        DEFINES += HAVE_COREAUDIO MALLOC_IS_ALIGNED
         LIBS += -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices -framework Accelerate
     }
 }