diff ChangeLog @ 30328:94f8a42e529b

merge of '9655e74ffa6d13bf9ad73bdbd432f003c33cae79' and 'e44423f9da531d77c6bc71cbb54f5a9ffc2e1a18'
author Paul Aurich <paul@darkrain42.org>
date Sun, 01 Aug 2010 20:22:57 +0000
parents bb1d593f185c
children 126317248aaa
line wrap: on
line diff
--- a/ChangeLog	Sun Aug 01 20:21:20 2010 +0000
+++ b/ChangeLog	Sun Aug 01 20:22:57 2010 +0000
@@ -38,7 +38,9 @@
 	* If a buddy is offline and we see from their profile that they have
 	  updated their avatar, request the new avatar image from the server.
 	* Fix a possible crash if a link is clicked while disconnected.
-	* New MXit Moods and Emoticons.
+	* Unescape any escaped characters in a chatroom nickname.
+	* Add the new MXit moods and emoticons.
+	* MXit emoticons added to the small emoticon theme.
 
 	XMPP:
 	* Allow connecting to servers that only advertise GSSAPI and expect