aboutsummaryrefslogtreecommitdiffstats
path: root/etc/ChangeLog
diff options
context:
space:
mode:
authorStefan Monnier2010-06-18 10:13:59 -0400
committerStefan Monnier2010-06-18 10:13:59 -0400
commit894e369ddf48e191638b8e66ce732f24ff9abe2a (patch)
tree0d14b38c2946f0067c856911bf4949b7e8091a88 /etc/ChangeLog
parent4a330052b4815cf833071aae5cb312f6f0f63613 (diff)
parentb1a03ef6bfba4296dddc3df1e8f9d54aba3e45e3 (diff)
downloademacs-894e369ddf48e191638b8e66ce732f24ff9abe2a.tar.gz
emacs-894e369ddf48e191638b8e66ce732f24ff9abe2a.zip
Merge from 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 872615c43e3..3e8adcb1b27 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
12010-06-12 Glenn Morris <rgm@gnu.org>
2
3 * tutorials/TUTORIAL.bg, tutorials/TUTORIAL.es: Fix typos.
4
12010-06-09 Michael Albinus <michael.albinus@gmx.de> 52010-06-09 Michael Albinus <michael.albinus@gmx.de>
2 6
3 * NEWS: Add notifications.el. 7 * NEWS: Add notifications.el.