Merge from emacs-23

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 799680498eab5d5dc9fb8838d2cdfba48fefb961..9e115942d398c2993c7c7565d55b74388c6ef4c2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-16  Glenn Morris  <rgm@gnu.org>
+
+       * editfns.c (Fbyte_to_string): Pacify compiler.
+
 2010-06-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * lread.c (read1): Phase out old-style backquotes a bit more.