# HG changeset patch
# User Chris Cannam
# Date 1435753623 -3600
# Node ID 1d30935982cdfebadb3809d0d00f6219d2d939fe
# Parent  ab244c0074baa8e73ebd45f6bdb22d558f05036e# Parent  b9e5e6d16e37be29e6c7e82d59b31289b5809eed
Merge from branch simple-fft-model

diff -r ab244c0074ba -r 1d30935982cd .hgsubstate
--- a/.hgsubstate	Wed Jul 01 13:21:08 2015 +0100
+++ b/.hgsubstate	Wed Jul 01 13:27:03 2015 +0100
@@ -2,5 +2,5 @@
 03ad9c0eb6ed8336deb93ae37bae27a7f31d4e7e icons/scalable
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
 83370e830c956be0fc4a7d9b5c30761b6ffb7613 svapp
-ee0aff1d0743680befe36e5627d31c019778d0b0 svcore
-3f7cdfc56dce366176fa6d06202c82e156996f2a svgui
+a65328f0c45067b31d55cdf4b0aa97f646bab37d svcore
+4f4f0e158ecf5e7ebeef8ba72023c70ccbdb92e7 svgui