diff ChangeLog @ 17257:cb5bd3c045a9

merge of '10181aa0574db4bb368e5eb9c7eb9440c61d930a' and '12efd7c55efaf31eca5fecc6ccdeeb12ee4b7d95'

--- a/ChangeLog	Wed May 23 23:13:11 2007 +0000
+++ b/ChangeLog	Wed May 23 23:17:50 2007 +0000
@@ -25,10 +25,32 @@
 	  unencrypted channel
 	* Fix XMPP SASL authentication error when using Cyrus and a connect server
 	* Fix changing tab locations to update properly
+<<<<<<< variant A
 	* ALSA added as a possible sound method
 	* Added Google Talk to the accounts dropdown
 	* Google Talk accounts will not import buddies from your Gmail addres
 	  book
+>>>>>>> variant B
+	* Turning off "Show formatting on incoming messages" now ignores
+	  formatting in <span> tags too
+	* File transfer progress for transfers on MSN is now correctly displayed
+	* You can set/change alias of buddies/chats by double-clicking on the
+	  conversation tabs (Ma Xuan)
+	* Fix IRC connection bug with dircproxy (xjoe)
+	* Ctrl+[shift]+tab focuses the next most active tab (William Thompson)
+	* Fix Open Hotmail Inbox for MSN to work more reliably
+	* Add a Google Talk item to the protocol list, to help users who think
+	  we don't support Google Talk.  The item acts just like "XMPP".
+	* Remember if the X server supports XScreenSaver, to avoid waking it
+	  every 5 seconds.  (Arjan van de Ven with Intel Corporation)
+	* Change our idle checking to poll only as necessary and raise the
+	  unidle timeout from 5 seconds to 60 when using XScreenSaver.  This
+	  and the XScreenSaver change will reduce Pidgin's effect on power
+	  consumption when running with NO_HZ.  (Arjan van de Ven with Intel
+	  Corporation)
+	* Conversation -> Save As will now use aliases.
+####### Ancestor
+======= end
 
 	Finch:
 	* Userlist in chat windows, which can be turned on or off using
@@ -37,6 +59,11 @@
 	* Improved tab completion support
 	* Ctrl+c prompts with a dialog before exiting
 	* Filter string in the debug window
+	* Notify when you leave a chat
+	* Work around an ncurses bug which appears when half of a multi-cell
+	  character is covered by an upper-level window
+	* New plugins are shown in bold text in the plugin dialog
+	* Nicer HTML screendumps
 
 version 2.0.0 (5/3/2007):
 	* The project has new names - libpurple for the core, Pidgin for the