diff CHANGELOG @ 870:ff52a5b766f7

Merge

--- a/CHANGELOG	Thu Sep 11 16:26:48 2014 +0100
+++ b/CHANGELOG	Wed Sep 24 18:55:37 2014 +0100
@@ -23,6 +23,10 @@
    electric piano with sustain. The piano sample is still available,
    and any sessions saved using it should continue to use it
 
+ - Add a cancel button for Vamp plugin processing: currently,
+   cancelling a transform results in a part-complete layer rather than
+   removing the results
+
  - Add keyboard shortcuts to cycle the current layer (in addition to
    the existing ones to cycle the current pane)
 
@@ -41,6 +45,9 @@
  - Make it possible to import CSV files directly into Note layers by
    adding Pitch as a data type in the CSV file import dialog
 
+ - Fix play pointer jump to wrong frame when clicking on row in the
+   layer edit dialog
+
  - Fix problems with keyboard shortcuts when using Qt5 on OS/X. This
    is the first release in which the official builds use Qt5 for all
    platforms.