Merge from emacs-24; up to 2014-06-15T04:52:34Z!eli@barzilay.org

[gnu-emacs] / etc / ChangeLog

diff --git a/etc/ChangeLog b/etc/ChangeLog
index ae44fc45c3c981865de87a1f87291ca5681e169f..5dfb205dce4f1676bb411f74493715eaa2616537 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-03  Glenn Morris  <rgm@gnu.org>
+
+       * refcards/calccard.tex (section{Getting Help}):
+       Meaning of "on-line" has changed.
+
 2014-06-28  Glenn Morris  <rgm@gnu.org>
 
        * publicsuffix.txt: Update from source.