The aforementioned merge happened
1 files changed, 0 insertions(+), 2 deletions(-)

M src/ResamplerWrapper.cpp
M src/ResamplerWrapper.cpp +0 -2
@@ 249,10 249,8 @@ ResamplerWrapper::reconstructResampler()
     
     Resampler::Parameters params;
     params.quality = Resampler::FastestTolerable;
-    /*!!! to be restored following resampler merge
     params.dynamism = Resampler::RatioMostlyFixed;
     params.ratioChange = Resampler::SuddenRatioChange;
-    */
     params.maxBufferSize = defaultMaxBufferSize;
     if (m_sourceRate != 0) {
         params.initialSampleRate = m_sourceRate;