Merge from emacs-24; up to 2012-04-22T13:58:00Z!cyd@gnu.org

[gnu-emacs] / doc / misc / ChangeLog

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 915e85a3e686ea35ccdae52ac6efc82ec84b0b87..812ec0214b0c874eb8452bdc19697286701f9a97 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-12  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * cc-mode.texi: Avoid space before macro in 4th argument of cross
+       reference commands.  (Bug#11461)
+
+       * Makefile.in (gnus.dvi): Use $@ instead of $*.dvi.
+
 2012-05-12  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (mostlyclean): Add more TeX intermediates.