# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1193161266 0
# Node ID f7e4a558a439933ff445c6f2f44b3539b6ec5026
# Parent  99dd2f0940ae9d9453dba560f4a15cde63383ce7# Parent  7697f68723806b5029f7fbd92acc861f5ac7127c
propagate from branch 'im.pidgin.pidgin.2.2.2' (head 5b8360c29b011dc10812b101bc5fa0f63b598d0b)
            to branch 'im.pidgin.pidgin' (head 38fc34684838f1e3890d0d04585797dcc423b838)

diff -r 99dd2f0940ae -r f7e4a558a439 ChangeLog
--- a/ChangeLog	Tue Oct 23 17:32:34 2007 +0000
+++ b/ChangeLog	Tue Oct 23 17:41:06 2007 +0000
@@ -39,6 +39,12 @@
 			  bugs marked as fixed in 2.2.1 or 2.2.2 will not be fixed
 			  until the next release.
 
+	* Various bug and memory leak fixes
+	* Look for a default prefs.xml in the CSIDL_COMMON_APPDATA directory
+	  (e.g. c:\Documents and Settings\All Users\
+	        Application Data\purple\prefs.xml) on Windows, similarly to
+	  how this is done on other platforms.
+
 version 2.2.1 (09/29/2007):
 	http://developer.pidgin.im/query?status=closed&milestone=2.2.1
 		NOTE: Due to the backporting that happened for the actual