Mercurial > hg > sonic-visualiser
changeset 1007:8d45d6412ca6 3.0-integration
Merge from branch osx-retina
| author | Chris Cannam |
|---|---|
| date | Fri, 26 Jun 2015 14:18:18 +0100 |
| parents | c96b848edef7 (diff) 0359493998b8 (current diff) |
| children | 2363196deed7 |
| files | .hgsubstate main/MainWindow.cpp |
| diffstat | 3 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Wed Jun 10 13:38:02 2015 +0100 +++ b/.hgsubstate Fri Jun 26 14:18:18 2015 +0100 @@ -1,6 +1,6 @@ d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay 845471c833a182376747b44a3ca28181bbdb3c93 icons/scalable 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds -8125b8cb8128b71ba9eb0759a8774c8038cd16e8 svapp -e4d40c185c72e262d7d5336ebaa856888bf2fe1d svcore -1011ffb1b6d5f67588f997d7a68fefed002886ae svgui +83370e830c956be0fc4a7d9b5c30761b6ffb7613 svapp +ee0aff1d0743680befe36e5627d31c019778d0b0 svcore +98827470ada2609207b65027dda747869076524b svgui
--- a/main/MainWindow.cpp Wed Jun 10 13:38:02 2015 +0100 +++ b/main/MainWindow.cpp Fri Jun 26 14:18:18 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 Jun 10 13:38:02 2015 +0100 +++ b/sonic-visualiser.pro Fri Jun 26 14:18:18 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