fix merge conflicts from master
[ardour.git] / libs / vamp-plugins / Onset.cpp
2013-08-24 Paul Davisfix merge conflicts from master
2013-08-02 Paul DavisMerge branch 'master' into windows
2013-08-01 Paul DavisMerge branch 'master' into windows
2013-08-01 Paul DavisMerge branch 'master' into windows
2013-08-01 Paul Davisfix merge conflict from master
2013-07-20 John EmmasModify 'libs/vamp-plugins' to be buildable with MSVC
2008-09-10 Paul Davismerge from 2.0-ongoing @ 3581