Merge remote-tracking branch 'upstream/stable'

This commit is contained in:
Brad Davis 2016-07-22 19:47:31 -07:00
commit 89d9affb41

View file

@ -502,5 +502,4 @@ AudioInjector* AudioInjector::playSound(const QByteArray& buffer, const AudioInj
}
}
return injector;
}