summaryrefslogtreecommitdiff
path: root/doc/man
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2010-05-08 14:47:07 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2010-05-08 14:47:07 -0400
commit0235128c15aabd21b37e7a359b4932709471f156 (patch)
tree4f32e3a638c4e3d6e7d9c232b3e0b4b939368f54 /doc/man
parentca63fca5b669d42d8c131a1f33446d9a9d7795f6 (diff)
parent19ae0deb1c8c9475eb81daf7876cec5a44b5d5e0 (diff)
downloademacs-0235128c15aabd21b37e7a359b4932709471f156.tar.gz
emacs-0235128c15aabd21b37e7a359b4932709471f156.tar.bz2
emacs-0235128c15aabd21b37e7a359b4932709471f156.zip
Merge from emacs-23
Diffstat (limited to 'doc/man')
-rw-r--r--doc/man/ChangeLog8
1 files changed, 6 insertions, 2 deletions
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index e9313979d95..2b2cbb90a9e 100644
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,11 +1,15 @@
+2010-05-07 Chong Yidong <cyd@stupidchicken.com>
+
+ * Version 23.2 released.
+
2010-03-10 Chong Yidong <cyd@stupidchicken.com>
* Branch for 23.2.
2010-01-09 Chong Yidong <cyd@stupidchicken.com>
- * emacs.1: Copyedits. Update options -Q, -mm and --daemon. Remove
- deprecated --unibyte option.
+ * emacs.1: Copyedits. Update options -Q, -mm and --daemon.
+ Remove deprecated --unibyte option.
2009-06-21 Chong Yidong <cyd@stupidchicken.com>