aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorStefan Monnier2010-05-08 14:47:07 -0400
committerStefan Monnier2010-05-08 14:47:07 -0400
commit0235128c15aabd21b37e7a359b4932709471f156 (patch)
tree4f32e3a638c4e3d6e7d9c232b3e0b4b939368f54 /admin
parentca63fca5b669d42d8c131a1f33446d9a9d7795f6 (diff)
parent19ae0deb1c8c9475eb81daf7876cec5a44b5d5e0 (diff)
downloademacs-0235128c15aabd21b37e7a359b4932709471f156.tar.gz
emacs-0235128c15aabd21b37e7a359b4932709471f156.zip
Merge from emacs-23
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index cf96d99d3b1..9ffdcd47d40 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
12010-05-07 Chong Yidong <cyd@stupidchicken.com>
2
3 * Version 23.2 released.
4
12010-04-01 Eli Zaretskii <eliz@gnu.org> 52010-04-01 Eli Zaretskii <eliz@gnu.org>
2 6
3 * CPP-DEFINES (__DJGPP__, __GO32__): Remove, no longer used. 7 * CPP-DEFINES (__DJGPP__, __GO32__): Remove, no longer used.