# HG changeset patch
# User Chris Cannam
# Date 1374072375 -3600
# Node ID f700ea718d5281d68357b5fc287b07180a9233f6
# Parent  f9f178efd6b8451e686b2fe8d8f5ff3f275179ca# Parent  420ade1cb6da314a5717637d902238b713ebc4b0
Merge from default branch

diff -r f9f178efd6b8 -r f700ea718d52 svcore.pro
--- a/svcore.pro	Wed Jul 17 15:45:29 2013 +0100
+++ b/svcore.pro	Wed Jul 17 15:46:15 2013 +0100
@@ -135,7 +135,7 @@
            data/fileio/PlaylistFileReader.h \
            data/fileio/QuickTimeFileReader.h \
            data/fileio/CoreAudioFileReader.h \
-           data/fileio/ResamplingWavFileReader.h \
+           data/fileio/DecodingWavFileReader.h \
            data/fileio/WavFileReader.h \
            data/fileio/WavFileWriter.h \
            data/midi/MIDIEvent.h \
@@ -196,7 +196,7 @@
            data/fileio/PlaylistFileReader.cpp \
            data/fileio/QuickTimeFileReader.cpp \
            data/fileio/CoreAudioFileReader.cpp \
-           data/fileio/ResamplingWavFileReader.cpp \
+           data/fileio/DecodingWavFileReader.cpp \
            data/fileio/WavFileReader.cpp \
            data/fileio/WavFileWriter.cpp \
            data/midi/MIDIInput.cpp \