# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1187149242 0
# Node ID fcc5d2de3b7421e3bed60f813a5104bd446a3a35
# Parent  2b1172af2f8b52a3437006b1370397bbd9deb0a7# Parent  b9f851240a5c8485c7a99b0731e5c42985bff505
merge of '197e1b0c22949c758e407b2720f5e051f5cb4adf'
     and '71fc765ce0faa44411e9b8f51d5edcf908b4a1a6'

diff -r 2b1172af2f8b -r fcc5d2de3b74 ChangeLog
--- a/ChangeLog	Tue Aug 14 22:39:18 2007 +0000
+++ b/ChangeLog	Wed Aug 15 03:40:42 2007 +0000
@@ -22,6 +22,7 @@
 	* Moved "Reset Formatting" toolbar button to Font menu.
 	* Double click on the infopane to alias buddies and set topics
 	  on chats
+	* New smiley style
 
 	Finch:
 	* Sound support (Eric Polino)