aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc/ChangeLog
diff options
context:
space:
mode:
authorStefan Monnier2010-03-24 14:02:56 -0400
committerStefan Monnier2010-03-24 14:02:56 -0400
commite867cb5d30200dd696b012e1ad0964d25c2a7ecc (patch)
tree3340026420f168909eaa734232e4890e15bc1626 /doc/misc/ChangeLog
parentb2b8574b8d03673f5673e2154d17c2cb80f59a0b (diff)
parentefee6a6d9cec2af824b8355c93d8f47b72a685a8 (diff)
downloademacs-e867cb5d30200dd696b012e1ad0964d25c2a7ecc.tar.gz
emacs-e867cb5d30200dd696b012e1ad0964d25c2a7ecc.zip
Merge from `emacs-23'.
Diffstat (limited to 'doc/misc/ChangeLog')
-rw-r--r--doc/misc/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 136a1eea0fb..1204e757771 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
12010-03-24 Michael Albinus <michael.albinus@gmx.de>
2
3 * trampver.texi: Update release number.
4
12010-03-10 Chong Yidong <cyd@stupidchicken.com> 52010-03-10 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * Branch for 23.2. 7 * Branch for 23.2.