Hand-apply a2f81da6d9afc5d3b5e647e1e05ca5d4507af42c from master;

allow "deletion" of the audio part of a FFmpeg file from the
timeline; delete unmaps the audio (#316).

1 files changed, 6 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index c15045f36..b063002d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-24  Carl Hetherington  <cth@carlh.net>
+
+	* Hand-apply 7ba9dcdbfe8f0d94ad9887843995c152c45dfe9e from master;
+	allow "deletion" of the audio part of a FFmpeg file from the
+	timeline; delete unmaps the audio (#316).
+
 2015-02-25  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.0.41 released.