diff README @ 551:e8e4552fbf70 with-dependencies

Merge from the default branch
author Chris Cannam <chris.cannam@eecs.qmul.ac.uk>
date Fri, 10 May 2013 12:09:08 +0100
parents 209c442fdb34
children 9f82fa990cbd
line wrap: on
line diff
--- a/README	Thu May 09 11:01:52 2013 +0100
+++ b/README	Fri May 10 12:09:08 2013 +0100
@@ -46,7 +46,7 @@
 design work by Christian Landone.  Thanks also to Craig Sapp for his
 suggestions and useful feedback.
 
-Code copyright 2005-2007 Chris Cannam and copyright 2006-2011 Queen
+Code copyright 2005-2007 Chris Cannam and copyright 2006-2013 Queen
 Mary, University of London, except where indicated in the individual
 source files.
 
@@ -72,8 +72,8 @@
 
 Sonic Visualiser may also make use of the following libraries:
 
- * Qt4 -- Copyright Nokia Corporation, distributed under the Lesser GPL
- * JACK -- Copyright Paul Davis, Jack O'Quin et al, under the Lesser GPL
+ * Qt5 -- Copyright Digia Oyj, distributed under the LGPL
+ * JACK -- Copyright Paul Davis, Jack O'Quin et al, under the LGPL
  * PortAudio -- Copyright Ross Bencina, Phil Burk et al, BSD license
  * Ogg decoder -- Copyright CSIRO Australia, BSD license
  * MAD mp3 decoder -- Copyright Underbit Technologies Inc, GPL
@@ -81,21 +81,17 @@
  * libsndfile -- Copyright Erik de Castro Lopo, LGPL
  * FFTW3 -- Copyright Matteo Frigo and MIT, GPL
  * Rubber Band -- Copyright Chris Cannam, GPL
- * Vamp plugin SDK -- Copyright Chris Cannam, BSD license
+ * Vamp plugin SDK -- Copyright Chris Cannam and QMUL, BSD license
  * LADSPA plugin SDK -- Copyright Richard Furse et al, LGPL
- * Redland RDF libraries -- Copyright Dave Beckett and the University of Bristol, LGPL/Apache license
  * RtMIDI -- Copyright Gary P. Scavone, BSD license
+ * Dataquay -- Copyright Breakfast Quay, BSD license
+ * Sord and Serd -- Copyright David Robillard, BSD license
+ * Redland -- Copyright Dave Beckett and the University of Bristol, LGPL/Apache license
  * liblo OSC library -- Copyright Steve Harris, GPL
 
 (Some distributions of Sonic Visualiser may have one or more of these
 libraries statically linked.)  Many thanks to their authors.
 
-Sonic Visualiser can also use QuickTime for audio file import on OS/X.
-For licensing reasons, you may not distribute binaries of Sonic
-Visualiser with QuickTime support included for any platform that does
-not include QuickTime as part of the platform itself (see section 3 of
-version 2 of the GNU General Public License).
-
 
 Compiling Sonic Visualiser
 --------------------------