Merge changes from emacs-23 branch

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index dc06f81d972cdf430e94b1006e9180db76ce0a14..efacbbc4583b68080df0e7f17d39292be91695e3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2011-04-08  Svante Signell  <svante.signell@telia.com>  (tiny change)
+
+       * term.c (init_tty): Fix incorrect ifdef placement (Bug#8450).
+
+2011-03-19  Christoph Scholtes  <cschol2112@googlemail.com>
+
+       * process.c (Fformat_network_address): Doc fix.
+
 2011-04-08  T.V. Raman  <tv.raman.tv@gmail.com>  (tiny change)
 
        * xml.c (parse_region): Avoid creating spurious whiespace nodes.