diff ChangeLog @ 22797:369d68b5b4d4

merge of '7f78e4be502956bb580a87289cf2acfe6254ea62' and 'adc2c416311e49c2c9279f1452fea30a94be7bfb'

--- a/ChangeLog	Wed Apr 30 22:52:16 2008 +0000
+++ b/ChangeLog	Thu May 01 03:06:17 2008 +0000
@@ -14,10 +14,12 @@
 	* Added a plugin (not built by default) which adds a Send button back
 	  to the conversation window. People without physical keyboards have a
 	  hard time with the lack of the button.
-	* Clicking on the buddyicon in the conversation window toggles the size of
-	  the icon between small and large.
-	* The settings of a chat (e.g. Handle in an XMPP chat, or Exchange in an
-	  AIM chat) can be edited from its context menu in the buddy list.
+	* Clicking on the buddyicon in the conversation window toggles the
+	  size of the icon between small and large.
+	* Add a "Present conversation window" preference to the Message
+	  Notification plugin, the "Raise conversation window" option does not
+	  unminimize windows or draw attention to them when they are on other
+	  workspaces the "Present" option should.
 
 	General:
 	* The configure script now dies on more absent dependencies.  The