diff ChangeLog @ 20691:f1fe9b873b0b

propagate from branch 'im.pidgin.pidgin.2.2.1' (head 7494c5484079eedcf158172f4208be3f986c068f) to branch 'im.pidgin.pidgin' (head ead56863984a2925621479326e71927d704eb22c)

--- a/ChangeLog	Fri Sep 28 18:21:40 2007 +0000
+++ b/ChangeLog	Fri Sep 28 18:23:54 2007 +0000
@@ -1,5 +1,37 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+Version 2.2.2:
+	http://developer.pidgin.im/query?status=closed&milestone=2.2.2
+		NOTE: Due to the backporting that happened for the 2.2.1
+		      release, it is possible bugs this release fixes bugs
+		      that were marked as fixed in 2.2.1.
+
+	libpurple:
+	* Real usernames are now shown in the system log.
+
+	Pidgin:
+	* If you alias a buddy to an alias that is already present within
+	  a particular group, we now offer to merge the buddies into the
+	  same contact.
+	* A music emblem is now displayed in the buddy list for a buddy if we
+	  know she is listening to some soothing music.
+	* Added a 'Move to' menu in buddy list context menu for moving buddies
+	  to other groups as an alternative to dragging.
+	* Group headings are now marked via an underline instead of a
+	  different color background.
+	* It is now possible to mark a chat on your buddy list as "Persistent"
+	  so you do not leave the chat when the window or tab is closed.
+	* The auto-join option for chats is now listed in the "Add Chat"
+	  dialog along with the new persistence option.
+	* Closing an IM no longer immediately closes your conversation.  It
+	  will now remain active for a short time so that if the conversation
+	  resumes, the history will be retained.  A preference has been added
+	  to toggle this behavior.
+	* The "Smiley" menu has been moved to the top-level of the toolbar.
+	* Pidgin's display is now saved with the command line for session
+	  restoration.  (David Mohr)
+	* ICQ Birthday notifications are shown as buddy list emblems
+
 Version 2.2.1:
 	http://developer.pidgin.im/query?status=closed&milestone=2.2.1
 		NOTE: Due to the backporting that happened for the actual
@@ -2264,4 +2296,4 @@
 	* Fixed WindowMaker Appicon
 	* Version Number in About Box
 	* Gaim Slogan in about box :)
-	* Created Changelog File :)
+	* Created Changelog File :)
\ No newline at end of file