(utf-7-encode): Use the right escape char depending on imap/nonimap encoding.

[gnu-emacs] / admin / ChangeLog

diff --git a/admin/ChangeLog b/admin/ChangeLog
index ca937e236e373ddcad43bf537ac71896a0bbb914..8f12e2870afdcb41f40f40284816495fd74636f1 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-22  Juanma Barranquero  <lekktu@gmail.com>
+
+       * FOR-RELEASE: Remove Windows problem about the XPM image library
+       being loaded too soon (fixed by Stefan Monnier on 2008-05-07).
+
 2008-04-15  Juanma Barranquero  <lekktu@gmail.com>
 
        * unidata/UnicodeData.txt: Update to Unicode 5.1.
@@ -655,15 +660,15 @@
 ;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006,
-      2007, 2008  Free Software Foundation, Inc.
+    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+       2008  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
-  GNU Emacs is free software; you can redistribute it and/or modify
+  GNU Emacs is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 3, or (at your option)
-  any later version.
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -671,8 +676,6 @@
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with GNU Emacs; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  Boston, MA 02110-1301, USA.
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; arch-tag: 97728c77-77c0-4156-b669-0e8c07d94e5a