aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Scholtes2012-02-05 22:06:38 -0700
committerChristoph Scholtes2012-02-05 22:06:38 -0700
commit9fc83efe01355793580cb01f2ca17a095010a56a (patch)
treee7d4cb4384c4167f9dcda1d48d4d28e4d277bffd
parent5f53d2441abf6eafe8e14f29d73e14afe8bec35f (diff)
downloademacs-9fc83efe01355793580cb01f2ca17a095010a56a.tar.gz
emacs-9fc83efe01355793580cb01f2ca17a095010a56a.zip
* 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.
-rw-r--r--admin/ChangeLog6
-rw-r--r--admin/nt/README.W326
2 files changed, 8 insertions, 4 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index af28f372509..0d9ff5bb3a4 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
12012-02-06 Christoph Scholtes <cschol2112@googlemail.com>
2
3 * nt/README.W32: Backported fixed url for image libraries from
4 trunk. Removed explicit reference to version of libXpm included in
5 binary distributions for maintenance purposes.
6
12012-01-19 Chong Yidong <cyd@gnu.org> 72012-01-19 Chong Yidong <cyd@gnu.org>
2 8
3 * Version 23.4 released. 9 * Version 23.4 released.
diff --git a/admin/nt/README.W32 b/admin/nt/README.W32
index efc6aca7485..010fe454023 100644
--- a/admin/nt/README.W32
+++ b/admin/nt/README.W32
@@ -114,13 +114,11 @@ See the end of the file for license conditions.
114 Emacs has built in support for XBM and PPM/PGM/PBM images, and the 114 Emacs has built in support for XBM and PPM/PGM/PBM images, and the
115 libXpm library is bundled, providing XPM support (required for color 115 libXpm library is bundled, providing XPM support (required for color
116 toolbar icons and splash screen). Source for libXpm should be available 116 toolbar icons and splash screen). Source for libXpm should be available
117 on the same place as you got this binary distribution from. The version 117 on the same place as you got this binary distribution from.
118 of libXpm bundled with this version of Emacs is 3.5.7, based on x.org's
119 libXpm library from X11R7.3.
120 118
121 Emacs can also support some other image formats with appropriate 119 Emacs can also support some other image formats with appropriate
122 libraries. These libraries are all available as part of GTK 120 libraries. These libraries are all available as part of GTK
123 download for Windows (http://www.gtk.org/download-windows.html), or 121 download for Windows (http://www.gtk.org/download/win32.php), or
124 from the GnuWin32 project. Emacs will find them if the directory 122 from the GnuWin32 project. Emacs will find them if the directory
125 they are installed in is on the PATH. 123 they are installed in is on the PATH.
126 124