# HG changeset patch
# User Chris Cannam
# Date 1481557613 0
# Node ID 65d34b07de85864bac19aa2b4322591bdf27138b
# Parent  a89ca5ccb95865e19c5b53ce766fb532f96306fb# Parent  00b16347602057a9e24afa2c515b5c9ebf2edf28
Merge

diff -r a89ca5ccb958 -r 65d34b07de85 .hgsubstate
--- a/.hgsubstate	Mon Dec 12 15:45:33 2016 +0000
+++ b/.hgsubstate	Mon Dec 12 15:46:53 2016 +0000
@@ -1,7 +1,7 @@
 e7ef7f547cac52afe4f3496040b9f5e7ca8247f5 bqaudioio
 048fd8ba184040d217f33a9ea3cbdc5676a2876f bqfft
 1735a488ded2bbd0f1a60cd33c4c26b3672e49a2 bqresample
-9fd9745307e54a53cbd09cb67a4f9783d1b02ed2 bqvec
+a4e39282cdf1aa6383a175666f6486e106b2a1b5 bqvec
 1eefc20919cd080b684b2bbbc0af7270b8facb54 checker
 3768bdde6fdf866aa63fff5bde8d9fa64a8979ef dataquay
 c37b5598a4beb570417716e30aa649c78312169f icons/scalable