Merge from emacs-23; up to 2010-06-16T23:27:20Z!jay.p.belanger@gmail.com.

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 32423da9afe193e3f1561729e26adcc484348aed..71efe9761aafd48502ca6dfb89556e27e0bf1973 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2011-07-06  Markus Heiser  <markus.heiser@darmarit.de>  (tiny change)
+
+       * progmodes/gud.el (gud-pdb-marker-regexp): Accept \r char (Bug#5653).
+
+2011-07-06  Chong Yidong  <cyd@stupidchicken.com>
+
+       * window.el (special-display-popup-frame): Doc fix (Bug#8853).
+
+       * info.el (Info-directory-toc-nodes): Minor doc fix (Bug#8833).
+
 2011-07-05  Chong Yidong  <cyd@stupidchicken.com>
 
        * button.el (button): Inherit from link face.  Suggested by Dan