Mercurial > hg > constant-q-cpp
changeset 186:e530a07a791a
Merge
| author | Chris Cannam <c.cannam@qmul.ac.uk> |
|---|---|
| date | Tue, 15 Sep 2015 13:57:53 +0100 |
| parents | f64841b3c6de (current diff) 8978216d837a (diff) |
| children | 5977a0f363d9 |
| files | |
| diffstat | 4 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Sep 15 13:57:33 2015 +0100 +++ b/.hgtags Tue Sep 15 13:57:53 2015 +0100 @@ -1,3 +1,4 @@ 361b4f8b7b2dbce9aebec3ff577f5c68f6fbb3ae v1.0 361b4f8b7b2dbce9aebec3ff577f5c68f6fbb3ae v1.0 5a4ece568299eba6ca7e54b283de5e98b6a3526b v1.0 +50a61e18af29ab383f210c1f2099b4dc49f1495f v1.1
--- a/README Tue Sep 15 13:57:33 2015 +0100 +++ b/README Tue Sep 15 13:57:53 2015 +0100 @@ -40,8 +40,8 @@ using multiple kernel atoms per time block. The inverse transform is approximate rather than exact (see the paper for details). -The C++ implementation is by Chris Cannam, Copyright 2014 Queen Mary, -University of London. +The C++ implementation is by Chris Cannam, Copyright 2014-2015 Queen +Mary, University of London. The library is provided under a liberal BSD/MIT-style open source licence. See the file COPYING for more information.
--- a/vamp/CQChromaVamp.cpp Tue Sep 15 13:57:33 2015 +0100 +++ b/vamp/CQChromaVamp.cpp Tue Sep 15 13:57:53 2015 +0100 @@ -89,13 +89,13 @@ int CQChromaVamp::getPluginVersion() const { - return 1; + return 2; } string CQChromaVamp::getCopyright() const { - return "Plugin by Chris Cannam. Method by Christian Schörkhuber and Anssi Klapuri. Copyright (c) 2014 QMUL. BSD/MIT licence."; + return "Plugin by Chris Cannam. Method by Christian Schörkhuber and Anssi Klapuri. Copyright (c) 2015 QMUL. BSD/MIT licence."; } CQChromaVamp::ParameterList
--- a/vamp/CQVamp.cpp Tue Sep 15 13:57:33 2015 +0100 +++ b/vamp/CQVamp.cpp Tue Sep 15 13:57:53 2015 +0100 @@ -114,13 +114,13 @@ int CQVamp::getPluginVersion() const { - return 1; + return 2; } string CQVamp::getCopyright() const { - return "Plugin by Chris Cannam. Method by Christian Schörkhuber and Anssi Klapuri. Copyright (c) 2014 QMUL. BSD/MIT licence."; + return "Plugin by Chris Cannam. Method by Christian Schörkhuber and Anssi Klapuri. Copyright (c) 2015 QMUL. BSD/MIT licence."; } CQVamp::ParameterList