Merge from emacs-23

[gnu-emacs] / doc / misc / ChangeLog

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 9761e599d8fcf4f6846709f443a35f78d9441cc4..e255b44f189e3fcde37b79ed53ae932bef6cecc1 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-09  Jay Belanger  <jay.p.belanger@gmail.com>
+
+       * calc.texi: Use emacsver.texi to determine Emacs version.
+
 2010-11-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus.texi (Customizing the IMAP Connection): Remove nnir mention,