From a2fdd299ad3c8318c210c9adda285ae3289fd67e Mon Sep 17 00:00:00 2001
From: Jean-Marie Traissard <jim@lapin.org>
Date: Tue, 11 Mar 2008 23:15:51 +0000
Subject: [PATCH] Added a notice in Changelog for emoticons.py format change,
 for users using their own emoticons to know. See #3696.

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

diff --git a/ChangeLog b/ChangeLog
index 09d388784..e5919c1dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Gajim 0.XX.X (svn)
+
+  * Modified the format of emoticons list file, so we can choose the default code (#3696)
+
 Gajim 0.11.4 (06 December 2007)
 
   * Fix /nick command in groupchats