comparison src/vamp-hostsdk/PluginSummarisingAdapter.cpp @ 366:aede6e90a6b8

Merge (but taking everything from the more recent default)
author Chris Cannam
date Wed, 25 Jun 2014 12:38:37 +0100
parents d5c5a52e6c9f
children 632d90c185ec
comparison
equal deleted inserted replaced
365:feac60b5d82b 366:aede6e90a6b8