Mercurial > hg > svcore
comparison svcore.pro @ 1217:046f05fa31f3 msvc2015_64
Merge from branch "3.0-integration"
| author | Chris Cannam |
|---|---|
| date | Tue, 18 Oct 2016 14:04:06 +0100 |
| parents | c811991a5efa f50ded4b951c |
| children | 6b847a59d908 |
comparison
equal
deleted
inserted
replaced
| 1216:c811991a5efa | 1217:046f05fa31f3 |
|---|---|
| 142 data/fileio/DataFileReader.h \ | 142 data/fileio/DataFileReader.h \ |
| 143 data/fileio/DataFileReaderFactory.h \ | 143 data/fileio/DataFileReaderFactory.h \ |
| 144 data/fileio/FileFinder.h \ | 144 data/fileio/FileFinder.h \ |
| 145 data/fileio/FileReadThread.h \ | 145 data/fileio/FileReadThread.h \ |
| 146 data/fileio/FileSource.h \ | 146 data/fileio/FileSource.h \ |
| 147 data/fileio/MatrixFile.h \ | |
| 148 data/fileio/MIDIFileReader.h \ | 147 data/fileio/MIDIFileReader.h \ |
| 149 data/fileio/MIDIFileWriter.h \ | 148 data/fileio/MIDIFileWriter.h \ |
| 150 data/fileio/MP3FileReader.h \ | 149 data/fileio/MP3FileReader.h \ |
| 151 data/fileio/OggVorbisFileReader.h \ | 150 data/fileio/OggVorbisFileReader.h \ |
| 152 data/fileio/PlaylistFileReader.h \ | 151 data/fileio/PlaylistFileReader.h \ |
| 200 data/fileio/CSVFileWriter.cpp \ | 199 data/fileio/CSVFileWriter.cpp \ |
| 201 data/fileio/CSVFormat.cpp \ | 200 data/fileio/CSVFormat.cpp \ |
| 202 data/fileio/DataFileReaderFactory.cpp \ | 201 data/fileio/DataFileReaderFactory.cpp \ |
| 203 data/fileio/FileReadThread.cpp \ | 202 data/fileio/FileReadThread.cpp \ |
| 204 data/fileio/FileSource.cpp \ | 203 data/fileio/FileSource.cpp \ |
| 205 data/fileio/MatrixFile.cpp \ | |
| 206 data/fileio/MIDIFileReader.cpp \ | 204 data/fileio/MIDIFileReader.cpp \ |
| 207 data/fileio/MIDIFileWriter.cpp \ | 205 data/fileio/MIDIFileWriter.cpp \ |
| 208 data/fileio/MP3FileReader.cpp \ | 206 data/fileio/MP3FileReader.cpp \ |
| 209 data/fileio/OggVorbisFileReader.cpp \ | 207 data/fileio/OggVorbisFileReader.cpp \ |
| 210 data/fileio/PlaylistFileReader.cpp \ | 208 data/fileio/PlaylistFileReader.cpp \ |