From fbe347d656059cf71eff84655b4fefff04ce2100 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Sun, 23 May 2010 21:19:37 +0000
Subject: [PATCH] Reflect the 0.6 branch in the Changelog.

Originally committed as revision 23270 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 Changelog | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Changelog b/Changelog
index c3ea45b..f7f4c80 100644
--- a/Changelog
+++ b/Changelog
@@ -4,6 +4,12 @@ releases are sorted from youngest to oldest.
 
 version <next>:
 
+- WebM support in Matroska demuxer
+
+
+
+version 0.6:
+
 - PB-frame decoding for H.263
 - deprecated vhook subsystem removed
 - deprecated old scaler removed
@@ -71,7 +77,6 @@ version <next>:
 - spectral extension support in the E-AC-3 decoder
 - unsharp video filter
 - RTP hinting in the mov/3gp/mp4 muxer
-- WebM support in Matroska demuxer
 
 
 
-- 
2.7.4