aboutsummaryrefslogtreecommitdiffstats
path: root/etc/ChangeLog
diff options
context:
space:
mode:
authorEli Zaretskii2013-03-30 20:37:57 +0300
committerEli Zaretskii2013-03-30 20:37:57 +0300
commitf1aa11971a74b7b2fa0f5baaaaf21dfbd388de6b (patch)
tree48e20bfab4262d7171593d4ef98309ae717c1cb6 /etc/ChangeLog
parent7c4026b6ad03974a55a175af17c8e76c61931b69 (diff)
parent119b2d43cc40759394cae256c0a38624cacbf776 (diff)
downloademacs-f1aa11971a74b7b2fa0f5baaaaf21dfbd388de6b.tar.gz
emacs-f1aa11971a74b7b2fa0f5baaaaf21dfbd388de6b.zip
Merge from trunk.
Diffstat (limited to 'etc/ChangeLog')
-rw-r--r--etc/ChangeLog8
1 files changed, 8 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 3468e70386d..92f31e6c6e8 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,11 @@
12013-03-30 Leo Liu <sdl.web@gmail.com>
2
3 * NEWS: Mention `kmacro-to-register' and new eldoc feature.
4
52013-03-29 Aidan Gauland <aidalgol@no8wireless.co.nz>
6
7 * NEWS: Added entry for em-tramp change in 2013-03-26T22:08:58Z!aidalgol@no8wireless.co.nz
8
12013-03-21 Eric Ludlam <zappo@gnu.org> 92013-03-21 Eric Ludlam <zappo@gnu.org>
2 10
3 * srecode/ede-autoconf.srt: Change Copyright to FSF. 11 * srecode/ede-autoconf.srt: Change Copyright to FSF.