# HG changeset patch
# User Chris Cannam
# Date 1435771888 -3600
# Node ID 8feac10dbdb46da3d4e60d237848db247295eeee
# Parent  1d30935982cdfebadb3809d0d00f6219d2d939fe# Parent  e57bee4a6d74d3d11a5b58f4f54e7d20bf28c2a0
Merge from branch simple-fft-model

diff -r 1d30935982cd -r 8feac10dbdb4 .hgsubstate
--- a/.hgsubstate	Wed Jul 01 13:27:03 2015 +0100
+++ b/.hgsubstate	Wed Jul 01 18:31:28 2015 +0100
@@ -1,6 +1,6 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 03ad9c0eb6ed8336deb93ae37bae27a7f31d4e7e icons/scalable
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
-83370e830c956be0fc4a7d9b5c30761b6ffb7613 svapp
-a65328f0c45067b31d55cdf4b0aa97f646bab37d svcore
-4f4f0e158ecf5e7ebeef8ba72023c70ccbdb92e7 svgui
+1b4e5a567d5819afabbf4ec79647cf6e608e019b svapp
+4d7de68707c8f1b47695f65c3a95eba4557de6aa svcore
+2adca8f05583809e64cbb1486ab2f58bff49c784 svgui