Mercurial > hg > svcore
diff plugin/FeatureExtractionPluginFactory.cpp @ 940:2481777d4c3e
Merge from branch tonioni (the two are currently in sync)
author | Chris Cannam |
---|---|
date | Wed, 18 Jun 2014 18:30:19 +0100 |
parents | f5cd33909744 |
children | 7aa9088e9bcd |