# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1179673742 0
# Node ID e4179a27f5be986dc5b4edb7493fdab144f32487
# Parent  d92776c252b81680c7d1def7d85cbd5154ccf13f# Parent  251ed95cc52ca5fe2d4b8162e028ff3b20122a9b
merge of '1b31a3a29b0aa69839b75bcf2fbc27ff3f36f3ed'
     and '70ef97577e36bac904647f87d4dbf571f6163a3f'

diff -r d92776c252b8 -r e4179a27f5be ChangeLog
--- a/ChangeLog	Sun May 20 15:07:49 2007 +0000
+++ b/ChangeLog	Sun May 20 15:09:02 2007 +0000
@@ -32,6 +32,15 @@
 	  conversation tabs (Ma Xuan)
 	* Fix IRC connection bug with dircproxy (xjoe)
 	* Ctrl+[shift]+tab focuses the next most active tab (William Thompson)
+	* 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)
 
 	Finch:
 	* Userlist in chat windows, which can be turned on or off using