From 7d221b2ef1a05f4b66eac01c7ca031a89351b0da Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@openedhand.com>
Date: Thu, 18 Oct 2007 12:31:53 +0000
Subject: [PATCH] Fix ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index 59e5112ce..31fbcf459 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,10 @@
 	same merge id returned by the loading functions. (Fixes
 	bug #558)
 
+	* test/test-script.c:
+	* test/test-script.json: Test unresolved merging and unmerging
+	in ClutterScript.
+
 2007-10-18  Matthew Allum  <mallum@openedhand.com>
 
 	* clutter/clutter-score.c: