# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1274631108 0
# Node ID 0e75ea0b5532cd3074bd6d8ddf8bc7c3da4b5457
# Parent  c80d5cf9d88e200f297051aeaf616ffdbd796d44
Merge Windows-specific changes for 2.7.0 and 2.7.1 into the main ChangeLog and
include a note at the top of ChangeLog.win32 explaining that the file will no
longer be updated.

diff -r c80d5cf9d88e -r 0e75ea0b5532 ChangeLog
--- a/ChangeLog	Sat May 22 15:14:54 2010 +0000
+++ b/ChangeLog	Sun May 23 16:11:48 2010 +0000
@@ -24,6 +24,10 @@
 	* Allow connecting to servers that advertise EXTERNAL (broken in
 	  2.7.0)
 
+	Windows-Specific Changes:
+	* Fix a regression introduced in 2.7.0 that caused Window Flashing not
+	  to work.
+
 version 2.7.0 (05/12/2010):
 	General:
 	* Changed GTK+ minimum version requirement to 2.10.0.
@@ -143,6 +147,21 @@
 	* New action 'history-search', with default binding ctrl+r, to search
 	  the entered string in the input history.
 
+	Windows-Specific Changes
+	* Updated GTK+ to 2.16.6
+	* Private GTK+ Runtime now used (GTK+ Installer no longer supported)
+	* Minimum required GTK+ version increased to 2.14.7
+	* Windows 95, Windows 98, Windows 98 Second Edition, Windows ME
+	  (Millennium Edition), and Windows NT 4.0 longer supported due to GTK+
+	  requirements changes.
+	* Crash Report files (pidgin.RPT) are now generated in the ~/.purple
+	  directory instead of the installation directory.
+	* NSS SSL Library upgraded to 3.12.5 (thanks to Berke Viktor)
+	* GtkSpell upgraded to 2.0.16, changing the spellchecking backend to
+	  enchant.  This means that myspell and hunspell (OpenOffice)
+	  dictionaries can be used (previous versions' aspell dictionaries
+	  will not work).
+
 version 2.6.6 (02/18/2010):
 	libpurple:
 	* Fix 'make check' on OS X. (David Fang)
diff -r c80d5cf9d88e -r 0e75ea0b5532 ChangeLog.win32
--- a/ChangeLog.win32	Sat May 22 15:14:54 2010 +0000
+++ b/ChangeLog.win32	Sun May 23 16:11:48 2010 +0000
@@ -1,12 +1,13 @@
-version 2.7.1 (??/??/????):
-	* Fix a regression introduced in 2.7.0 that caused Window Flashing not
-	  to work.
+Starting with Pidgin version 2.7.1, this ChangeLog file will no longer be
+updated.  It will be kept in the source tree for historical reasons only.
 
 version 2.7.0 (05/12/2010):
 	* Updated GTK+ to 2.16.6
 	* Private GTK+ Runtime now used (GTK+ Installer no longer supported)
 	* Minimum required GTK+ version increased to 2.14.7
-	* Win9x no longer supported.
+	* Windows 95, Windows 98, Windows 98 Second Edition, Windows ME
+	  (Millennium Edition), and Windows NT 4.0 longer supported due to GTK+
+	  requirements changes.
 	* Crash Report files (pidgin.RPT) are now generated in the ~/.purple
 	  directory instead of the installation directory.
 	* NSS SSL Library upgraded to 3.12.5 (thanks to Berke Viktor)