Merged from miles@gnu.org--gnu-2005 (patch 60-65, 246-265)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-246
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-247
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-248
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-249
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-250
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-251
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-252
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-253
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-254
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-255
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-256
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-257
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-258
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-259
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-260
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-261
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-262
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-263
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-264
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-265
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-60
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-61
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-62
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-63
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-64
   (mm-string-to-multibyte): Use Gnus trunk definition.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-65
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-328

2 files changed, 6 insertions, 1 deletions

diff --git a/mac/ChangeLog b/mac/ChangeLog
index 9a1ded737ff..4d3dba217d3 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-14  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * makefile.MPW (NonCarbonLibs): Add LocalesLib.  Delete
+        TextEncodingConverter.
+
 2005-04-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
diff --git a/mac/makefile.MPW b/mac/makefile.MPW
index bd7ced4a14f..5e0a6e1d890 100644
--- a/mac/makefile.MPW
+++ b/mac/makefile.MPW
@@ -146,7 +146,7 @@ NonCarbonLibs = ¶
         "{SharedLibraries}StdCLib" ¶
         "{SharedLibraries}MathLib" ¶
         "{SharedLibraries}AppleScriptLib" ¶
-        "{SharedLibraries}TextEncodingConverter" ¶
+        "{SharedLibraries}LocalesLib" ¶
         "{SharedLibraries}AppearanceLib" ¶
         "{SharedLibraries}QuickTimeLib" ¶
         "{PPCLibraries}StdCRuntime.o" ¶