aboutsummaryrefslogtreecommitdiffstats
path: root/etc/ChangeLog
diff options
context:
space:
mode:
authorKenichi Handa2014-07-05 23:07:57 +0900
committerKenichi Handa2014-07-05 23:07:57 +0900
commitaeb894a9a06d84d29b93ca04432d7cbed366e665 (patch)
treee2b73f9a76bc826c7a443e9a8d4fb3b49bdf7332 /etc/ChangeLog
parent763a11d0d0dcf543e89a22c98f55ea07c40ceefa (diff)
parenta984543a4488ed08778eb775d62f7091db117945 (diff)
downloademacs-aeb894a9a06d84d29b93ca04432d7cbed366e665.tar.gz
emacs-aeb894a9a06d84d29b93ca04432d7cbed366e665.zip
merge trunk
Diffstat (limited to 'etc/ChangeLog')
-rw-r--r--etc/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index ae44fc45c3c..5dfb205dce4 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
12014-07-03 Glenn Morris <rgm@gnu.org>
2
3 * refcards/calccard.tex (section{Getting Help}):
4 Meaning of "on-line" has changed.
5
12014-06-28 Glenn Morris <rgm@gnu.org> 62014-06-28 Glenn Morris <rgm@gnu.org>
2 7
3 * publicsuffix.txt: Update from source. 8 * publicsuffix.txt: Update from source.