changeset 30756:6f9132dcc21e

merge of '4af706c0918fd1eb930a0f2807a80a9f189b7b98' and 'b96fb413eb4d1392e8ae73177b72639f74da632c'
author Daniel Atallah <daniel.atallah@gmail.com>
date Sun, 01 Aug 2010 13:43:37 +0000
parents 4a88d29b8bae (current diff) bb1d593f185c (diff)
children 22a2b982ae65
files
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Aug 01 06:55:21 2010 +0000
+++ b/ChangeLog	Sun Aug 01 13:43:37 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