From b1592629ca827787b650a65496b3eec854059f84 Mon Sep 17 00:00:00 2001
From: Neil Roberts <neil@openedhand.com>
Date: Fri, 25 Apr 2008 15:03:24 +0000
Subject: [PATCH] Updated the ChangeLog with a note about the clutter-ivan
 merge.

---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 111cef009..6be3a4e75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-25  Neil Roberts  <neil@o-hand.com>
+
+	Merged in the clutter-ivan branch which contained the new public
+	COGL API.
+
 2008-04-25  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* clutter/sdl/clutter-stage-sdl.[ch]: Port the SDL stage to