Merge from emacs--rel--22

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 089afb97ecc6a1db211b418eabaf0c8c8078afda..9c5c073fc79c3455ddea5ca230eab2c7288a9311 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * macterm.c (x_draw_relief_rect): Remove unused variable `dpy'.
+
 2008-05-15  Kenichi Handa  <handa@m17n.org>
 
        * font.c (font_find_for_lface): Reflect LFACE_FONT in the font