Merge from emacs-23; up to 2010-06-03T22:16:02Z!dann@ics.uci.edu

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 5976265ef85ac0735610d7e2dc991fc6bab24160..a30981143886ed54bd8adc052466952a67e021a3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * fringe.c (update_window_fringes): Remove unused variables.
+
+       * unexmacosx.c (copy_data_segment): Also copy __got section.
+       (Bug#8223)
+
 2011-03-12  Eli Zaretskii  <eliz@gnu.org>
 
        * termcap.c [MSDOS]: Include "msdos.h.