aboutsummaryrefslogtreecommitdiffstats
path: root/etc/ChangeLog
diff options
context:
space:
mode:
authorKenichi Handa2014-07-02 00:34:58 +0900
committerKenichi Handa2014-07-02 00:34:58 +0900
commit763a11d0d0dcf543e89a22c98f55ea07c40ceefa (patch)
tree9ecaec1b8a509a799903926ecd961ab905a1b1bd /etc/ChangeLog
parent0782685d43f026b2366dbacbebc79021a9df50c6 (diff)
parenta519335cc3a00f3d4d8efac2c08d9b6b17c7fcf0 (diff)
downloademacs-763a11d0d0dcf543e89a22c98f55ea07c40ceefa.tar.gz
emacs-763a11d0d0dcf543e89a22c98f55ea07c40ceefa.zip
merge trunk
Diffstat (limited to 'etc/ChangeLog')
-rw-r--r--etc/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index fbeaed956a4..ae44fc45c3c 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
12014-06-28 Glenn Morris <rgm@gnu.org>
2
3 * publicsuffix.txt: Update from source.
4
12014-06-24 Eli Barzilay <eli@barzilay.org> 52014-06-24 Eli Barzilay <eli@barzilay.org>
2 6
3 * NEWS: calculator.el user-visible changes. 7 * NEWS: calculator.el user-visible changes.