Mercurial > hg > svapp
comparison svapp.pro @ 520:c3648c667a0b 3.0-integration
Merge from branch "alignment-simple"
| author | Chris Cannam |
|---|---|
| date | Thu, 21 Apr 2016 15:06:43 +0100 |
| parents | f7ec9e410108 51befd6165a3 |
| children | f257967855e2 85c83499be3c |
comparison
equal
deleted
inserted
replaced
| 518:f7ec9e410108 | 520:c3648c667a0b |
|---|---|
| 55 audio/AudioGenerator.cpp \ | 55 audio/AudioGenerator.cpp \ |
| 56 audio/ClipMixer.cpp \ | 56 audio/ClipMixer.cpp \ |
| 57 audio/ContinuousSynth.cpp \ | 57 audio/ContinuousSynth.cpp \ |
| 58 audio/PlaySpeedRangeMapper.cpp | 58 audio/PlaySpeedRangeMapper.cpp |
| 59 | 59 |
| 60 HEADERS += framework/Document.h \ | 60 HEADERS += framework/Align.h \ |
| 61 framework/Document.h \ | |
| 61 framework/MainWindowBase.h \ | 62 framework/MainWindowBase.h \ |
| 62 framework/SVFileReader.h \ | 63 framework/SVFileReader.h \ |
| 63 framework/TransformUserConfigurator.h \ | 64 framework/TransformUserConfigurator.h \ |
| 64 framework/VersionTester.h | 65 framework/VersionTester.h |
| 65 | 66 |
| 66 SOURCES += framework/Document.cpp \ | 67 SOURCES += framework/Align.cpp \ |
| 68 framework/Document.cpp \ | |
| 67 framework/MainWindowBase.cpp \ | 69 framework/MainWindowBase.cpp \ |
| 68 framework/SVFileReader.cpp \ | 70 framework/SVFileReader.cpp \ |
| 69 framework/TransformUserConfigurator.cpp \ | 71 framework/TransformUserConfigurator.cpp \ |
| 70 framework/VersionTester.cpp | 72 framework/VersionTester.cpp |
| 71 | 73 |