diff ChangeLog @ 20059:dae7c3c091e0

merge of '9f5274448f45f6503b6ea291ada3c4e0e00b8c52' and 'db4583bc475b46b7cb9baa38229f12473d331870'
author Sean Egan <seanegan@gmail.com>
date Sat, 15 Sep 2007 20:35:41 +0000
parents 507e109387fd 25a2c78bff50
children ed5254916b75
line wrap: on
line diff
--- a/ChangeLog	Sat Sep 15 20:33:45 2007 +0000
+++ b/ChangeLog	Sat Sep 15 20:35:41 2007 +0000
@@ -6,7 +6,10 @@
 	Pidgin:
 	* When aliasing someone to an alias that already exists in the
 	  same group, offer to merge the buddies into the same contact
-	* 'Move to' submenu in Buddy List context menu
+	* It's possible to keep a conversation (chat/IM) open even after closing
+	  the conversation window/tab.
+	* A music emblem is displayed in the buddy list for a buddy if we know she
+	  is listening to some soothing music.
 
 Version 2.2.0 (09/13/2007):
 	http://developer.pidgin.im/query?status=closed&milestone=2.2.0