From 5ccf1fe540736f72ebcdcfa3e84c3ed79a704e2a Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Wed, 20 Mar 2013 15:02:23 -0700
Subject: [PATCH] update ChangeLog

Change-Id: If845005a1d62730d23f7f138ffad4f45acdd2bfe
---
 ChangeLog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 0ae1119bb..9296f1433 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2560c24 update NEWS
+f43bafc Merge changes Iecccb09c,If5ee9fd2,I3e181ce4 into 0.3.0
+a788644 dwebp: warn when decoding animated webp's
+302efcd Decode: return more meaningful error for animation
+ad45273 WebPBitstreamFeatures: add has_animation field
+783dfa4 disable FRGM decoding for good in libwebpmux
+4b956be Update ChangeLog
 ad8b86d update NEWS
 3e084f6 Merge "demux cosmetics: comments/rename internal function" into 0.3.0
 d3f8c62 Merge "move WebPFeatureFlags declaration" into 0.3.0