# HG changeset patch
# User Chris Cannam
# Date 1420652541 0
# Node ID e57bee4a6d74d3d11a5b58f4f54e7d20bf28c2a0
# Parent  b9e5e6d16e37be29e6c7e82d59b31289b5809eed# Parent  385bb7313bdbecc5e219b739a21bb6bb12734214
Merge from default branch

diff -r 385bb7313bdb -r e57bee4a6d74 .hgsubstate
--- a/.hgsubstate	Wed Jul 01 15:53:54 2015 +0100
+++ b/.hgsubstate	Wed Jan 07 17:42:21 2015 +0000
@@ -1,5 +1,5 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
-ad998a2fe9e286113edd3e2f2cfa70b835b3f7e9 svapp
-1517d4c60e88ee851ec1c23063fcb908488591f9 svcore
-3871dffc31bd634547446e741a4143766b3856f6 svgui
+39ab248a49989ebecf87a072390b564f9306b7a1 svapp
+457a1a619c5fedf4591bca81ff58df0baa0bafc7 svcore
+2d4d0dbb94e3e6d7d0490df96473573c51f41c36 svgui
diff -r 385bb7313bdb -r e57bee4a6d74 main/MainWindow.cpp
--- a/main/MainWindow.cpp	Wed Jul 01 15:53:54 2015 +0100
+++ b/main/MainWindow.cpp	Wed Jan 07 17:42:21 2015 +0000
@@ -68,7 +68,6 @@
 #include "data/fileio/MIDIFileWriter.h"
 #include "data/fileio/BZipFileDevice.h"
 #include "data/fileio/FileSource.h"
-#include "data/fft/FFTDataServer.h"
 #include "data/midi/MIDIInput.h"
 #include "base/RecentFiles.h"
 #include "transform/TransformFactory.h"