# HG changeset patch
# User Chris Cannam
# Date 1435324663 -3600
# Node ID c96b848edef77f1f1bb743052540e28f48ff2ce2
# Parent  8be8dc3a087345c829f3810fb798f2869dcd9881# Parent  0a8b0313920cbc94ba79108cf7785b4aa74d8c20
Merge from branch simple-fft-model

diff -r 0a8b0313920c -r c96b848edef7 .hgsubstate
--- a/.hgsubstate	Tue Jun 16 20:32:44 2015 +0100
+++ b/.hgsubstate	Fri Jun 26 14:17:43 2015 +0100
@@ -1,5 +1,5 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
-1020db1698c01ab04851fcb583e9e26a0bad7c1f svapp
-393134235fa0f1aa9cd4d1fc68a732030296365e svcore
-b8187c83b93aa9de7eb0a3718a1488a2c8cdf4ae svgui
+83370e830c956be0fc4a7d9b5c30761b6ffb7613 svapp
+ee0aff1d0743680befe36e5627d31c019778d0b0 svcore
+98827470ada2609207b65027dda747869076524b svgui