Browse files

merge emacs-23

  • Loading branch information...
2 parents 77a56e3 + 3abbfd0 commit 2d04c02e508526771279c2a80c0f3942f9fc92b6 Kenichi Handa committed Mar 4, 2012
Showing with 8 additions and 4 deletions.
  1. +6 −0 admin/ChangeLog
  2. +2 −4 admin/nt/README.W32
@@ -1,3 +1,9 @@
+2012-02-06 Christoph Scholtes <>
+ * 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 <>
* Version 23.4 released.
@@ -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'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 (, or
+ download for Windows (, or
from the GnuWin32 project. Emacs will find them if the directory
they are installed in is on the PATH.

0 comments on commit 2d04c02

Please sign in to comment.