* admin/nt/README.W32: Backported fixed url for image libraries from

trunk. Removed explicit reference to version of libXpm included in
binary distributions for maintenance purposes.

diff --git a/admin/ChangeLog b/admin/ChangeLog
index af28f372509308430ce0e570784eeff2e71dde35..0d9ff5bb3a418ca34d2290dea86dc1711b83056c 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-06  Christoph Scholtes  <cschol2112@googlemail.com>
+
+       * nt/README.W32: Backported fixed url for image libraries from
+       trunk. Removed explicit reference to version of libXpm included in
+       binary distributions for maintenance purposes.
+
 2012-01-19  Chong Yidong  <cyd@gnu.org>
 
        * Version 23.4 released.

diff --git a/admin/nt/README.W32 b/admin/nt/README.W32
index efc6aca748580ee7a56f4d55537e132d188185f7..010fe454023ddb158aafa9840a77059ac6714167 100644 (file)
--- a/admin/nt/README.W32
+++ b/admin/nt/README.W32
@@ -114,13 +114,11 @@ See the end of the file for license conditions.
   Emacs has built in support for XBM and PPM/PGM/PBM images, and the
   libXpm library is bundled, providing XPM support (required for color
   toolbar icons and splash screen).  Source for libXpm should be available
-  on the same place as you got this binary distribution from.  The version
-  of libXpm bundled with this version of Emacs is 3.5.7, based on x.org's
-  libXpm library from X11R7.3.
+  on the same place as you got this binary distribution from.
 
   Emacs can also support some other image formats with appropriate
   libraries.  These libraries are all available as part of GTK
-  download for Windows (http://www.gtk.org/download-windows.html), or
+  download for Windows (http://www.gtk.org/download/win32.php), or
   from the GnuWin32 project.  Emacs will find them if the directory
   they are installed in is on the PATH.