diff .hgsubstate @ 1523:f73a4e8c7040

Merge from branch 3.0-integration
author Chris Cannam
date Tue, 10 Jan 2017 16:21:32 +0000
parents d18ec6615103
children 0f42e0ec6f4c
line wrap: on
line diff
--- a/.hgsubstate	Tue Jan 10 16:10:33 2017 +0000
+++ b/.hgsubstate	Tue Jan 10 16:21:32 2017 +0000
@@ -1,5 +1,13 @@
-2777e3578cf15fd0e579dc6ca9cdfe0d93d400f2 dataquay
-55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
-d65ce7e553469e65be564a2168f42d45ba1135a3 svapp
-59ae7e04f7e982f08be31c3d635dcee358c50861 svcore
-e8102ff5573b5d89c54da4a92b9c7fbd1a27962b svgui
+4542e34b7d8cc86a4b12651d692dcdb63f45e9e5 bqaudioio
+fec5b1dfb6cd59c632f4aa412e3458f49e36367d bqfft
+482d0362594bce1e5347295a188c5a81cf2ab0fd bqresample
+ede817a08bd1e9835348a6477530bd3253fb379c bqvec
+e791c14261313d50166bee9baf57d243dd5d4c12 checker
+3768bdde6fdf866aa63fff5bde8d9fa64a8979ef dataquay
+3d2cde3b1ab3d39c7f9e542250c288a9da0f6850 icons/scalable
+3257ddb6fff110cc88f3ffeaeefa0f29d5eb3b6f piper-cpp
+95867ba8caa86f69fdd57366dbfe2f977dd9cb5d sv-dependency-builds
+1a8a8980f39a8e735c90837a4c2260248aafe7f1 svapp
+1bf38a4b91c4cfd7a77de73fa77a6723f80fe211 svcore
+be42a33a3db6c11559166b65c30bcd7248a46c9f svgui
+ea8e56f0796afebe78e9e678f4b674c1d7fb279e vamp-plugin-sdk