comparison README @ 366:aede6e90a6b8

Merge (but taking everything from the more recent default)
author Chris Cannam
date Wed, 25 Jun 2014 12:38:37 +0100
parents 763370655eec
children 14b34e85523b
comparison
equal deleted inserted replaced
365:feac60b5d82b 366:aede6e90a6b8
235 ======= 235 =======
236 236
237 Vamp and the Vamp SDK were designed and made at the Centre for Digital 237 Vamp and the Vamp SDK were designed and made at the Centre for Digital
238 Music at Queen Mary, University of London. 238 Music at Queen Mary, University of London.
239 239
240 The SDK was written by Chris Cannam, copyright (c) 2005-2009 240 The SDK was written by Chris Cannam, copyright (c) 2005-2014
241 Chris Cannam and QMUL. 241 Chris Cannam and QMUL.
242 242
243 Mark Sandler and Christian Landone provided ideas and direction, and 243 Mark Sandler and Christian Landone provided ideas and direction, and
244 Mark Levy, Dan Stowell, Martin Gasser and Craig Sapp provided testing 244 Mark Levy, Dan Stowell, Martin Gasser and Craig Sapp provided testing
245 and other input for the 1.0 API and SDK. The API also uses some ideas 245 and other input for the 1.0 API and SDK. The API also uses some ideas