diff ChangeLog @ 22779:9467ae6096fd

merge of '52c0efb045580dac7b6f5e40c91002e917e0cae3' and 'c0a4f0ab190b75af3dd06de77efc3ac462a4d6c7'

--- a/ChangeLog	Tue Apr 29 02:58:23 2008 +0000
+++ b/ChangeLog	Tue Apr 29 03:31:51 2008 +0000
@@ -14,8 +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.
+	* 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