diff .hgsubstate @ 507:fc726260b29b

Merge from branch "2.0-integration"
author Chris Cannam
date Mon, 19 Oct 2015 11:38:17 +0100
parents 34875d3cd963
children 7b1dbed4eda8
line wrap: on
line diff
--- a/.hgsubstate	Fri Aug 14 18:16:14 2015 +0100
+++ b/.hgsubstate	Mon Oct 19 11:38:17 2015 +0100
@@ -1,7 +1,11 @@
-f9f5185ab1a9dbd5115ee8fb5c55397e3d753854 chp
+e09d3c02709624b266b62b63a6218d4f330b677e bqaudioio
+576a130debf70b3a57c9189bfa1de64d8f64dc14 bqresample
+b5c7ca480bf7dc5c602e456480d53ecce3d58e42 bqvec
+456842723db65e5553e3506a8fedc8f21d9ea537 chp
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
-0ea1d1b67396e6fea7988ed4523ba8835461564d pyin
+cbb548cfe0330f450a042e79f69987d8847d1c42 icons/scalable
+5c1572dd225a7fa23b520219ce4515961aafa7a5 pyin
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
-b36042cb972a7c857b556517b11ba1088cd13b2f svapp
-e22bfe8ca2486f952883879b935df82c65d34de1 svcore
-788b7623bfcae2b974c683313682a088c864588e svgui
+83c60632bac02efd174220f2db8e14786cf57972 svapp
+7fb1a7199e5b63513b2a21453db2fc67e622e473 svcore
+2e3d388489e5d881bb96c9ae038915ea8bf05d09 svgui