# HG changeset patch
# User Chris Cannam
# Date 1453206893 0
# Node ID 57001443887ae1b31a829ff86f1bdf688bccfaca
# Parent  a83baa05a7012a249b6e4f57c1ffc56f553457f4# Parent  36de09aaa614e00d1501fbb57753b4db9c9daa74
Merge from branch 3.0-integration

diff -r 36de09aaa614 -r 57001443887a .hgsubstate
--- a/.hgsubstate	Tue Jan 19 12:34:38 2016 +0000
+++ b/.hgsubstate	Tue Jan 19 12:34:53 2016 +0000
@@ -1,4 +1,4 @@
-3436df58863b2eb00f013605b43aef33676ab45d bqaudioio
+e09d3c02709624b266b62b63a6218d4f330b677e bqaudioio
 62c40e7f9231e459091c3352c5d4b6001be127ca bqresample
 94b6ebd5e8ab897e5b294fd77b4113e8d6d78b13 bqvec
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
@@ -6,4 +6,4 @@
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
 39e94df71d24b92f30f8215cb542d6e481e42281 svapp
 afed8be790321ebc805b2620bcddb91405886c8d svcore
-7242fe160c19015cf79440223b2f998236ea205f svgui
+2a85ab180d08d990d778ae9c9f3be5cca4a5adb1 svgui