Mercurial > hg > sonic-visualiser
changeset 1021:ab244c0074ba 3.0-integration
Merge from branch osx-retina
| author | Chris Cannam |
|---|---|
| date | Wed, 01 Jul 2015 13:21:08 +0100 |
| parents | 2363196deed7 (diff) a1927baa3d87 (current diff) |
| children | 1d30935982cd |
| files | .hgsubstate |
| diffstat | 3 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Wed Jul 01 13:20:39 2015 +0100 +++ b/.hgsubstate Wed Jul 01 13:21:08 2015 +0100 @@ -1,6 +1,6 @@ d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay 03ad9c0eb6ed8336deb93ae37bae27a7f31d4e7e icons/scalable 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds -8125b8cb8128b71ba9eb0759a8774c8038cd16e8 svapp -e4d40c185c72e262d7d5336ebaa856888bf2fe1d svcore -e8949ccb4f4e135abb0941be1b7e73e3afb0c1cd svgui +83370e830c956be0fc4a7d9b5c30761b6ffb7613 svapp +ee0aff1d0743680befe36e5627d31c019778d0b0 svcore +3f7cdfc56dce366176fa6d06202c82e156996f2a svgui
--- a/main/MainWindow.cpp Wed Jul 01 13:20:39 2015 +0100 +++ b/main/MainWindow.cpp Wed Jul 01 13:21:08 2015 +0100 @@ -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"
--- a/sonic-visualiser.pro Wed Jul 01 13:20:39 2015 +0100 +++ b/sonic-visualiser.pro Wed Jul 01 13:21:08 2015 +0100 @@ -5,7 +5,7 @@ # We should build and run the tests on any platform, # but doing it automatically doesn't work so well from # within an IDE on Windows, so remove that from here - SUBDIRS += svcore/base/test svcore/data/fileio/test + SUBDIRS += svcore/base/test svcore/data/fileio/test svcore/data/model/test } sub_sv.file = sv.pro