# HG changeset patch
# User Chris Cannam
# Date 1373291112 -3600
# Node ID 4ca10ec57e3ae52258fdcbc4b3e5e97a8a437c31
# Parent  9e8d1f0f5066e1df0704f562b95398153f339d95# Parent  73d0c760de5ca7105484e73b2e3fc3639369c02b
Merge

diff -r 9e8d1f0f5066 -r 4ca10ec57e3a .hgtags
--- a/.hgtags	Mon Jul 08 14:44:16 2013 +0100
+++ b/.hgtags	Mon Jul 08 14:45:12 2013 +0100
@@ -30,3 +30,5 @@
 f8833ed742fc8bef02a01c15c87e6ffb2fd7ee1d sv_v2.0
 6b8e6600fa02931945185884485dc9b4e3b88e1c sv_v2.0
 0757db4b5d103a950512d218374060ab392930b0 sv_v2.1
+0757db4b5d103a950512d218374060ab392930b0 sv_v2.1
+deabb09d994be070f7cccdd52c23351746427f92 sv_v2.1
diff -r 9e8d1f0f5066 -r 4ca10ec57e3a CHANGELOG
--- a/CHANGELOG	Mon Jul 08 14:44:16 2013 +0100
+++ b/CHANGELOG	Mon Jul 08 14:45:12 2013 +0100
@@ -1,3 +1,11 @@
+
+Changes in Sonic Visualiser 2.1 since the previous release 2.0.1:
+
+ - Fix incorrect handling of FixedSampleRate outputs (Vamp SDK fix)
+ - Make it easier to see results from transforms that return a single point
+ - Make labelling clearer on time-value layers
+ - Add discrete-curve mode for time-value layers (for curves with gaps)
+ - Update code to build against Qt5
 
 Changes in Sonic Visualiser 2.0.1 since the previous release 2.0: