aboutsummaryrefslogtreecommitdiffstats
path: root/man/ChangeLog
diff options
context:
space:
mode:
authorCarsten Dominik2005-05-20 11:27:45 +0000
committerCarsten Dominik2005-05-20 11:27:45 +0000
commit24e9a727ba9d150f2bdaf4cf67f27e3acb1ae93a (patch)
tree8fe97e7e6501b73082e15ba40503b3db60393f8c /man/ChangeLog
parenteb2f9c591be5562ff3c1d5f21d22d3c7b5ef538e (diff)
downloademacs-24e9a727ba9d150f2bdaf4cf67f27e3acb1ae93a.tar.gz
emacs-24e9a727ba9d150f2bdaf4cf67f27e3acb1ae93a.zip
*** empty log message ***
Diffstat (limited to 'man/ChangeLog')
-rw-r--r--man/ChangeLog11
1 files changed, 11 insertions, 0 deletions
diff --git a/man/ChangeLog b/man/ChangeLog
index acde7c5b491..077d393f521 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,13 @@
12005-05-20 Carsten Dominik <dominik@science.uva.nl>
2
3 * org.texi: Version 3.09
4
5<<<<<<< ChangeLog
62005-05-18 Carsten Dominik <dominik@science.uva.nl>
7
8 * reftex.texi: Version 4.28
9
10=======
12005-05-18 Luc Teirlinck <teirllm@auburn.edu> 112005-05-18 Luc Teirlinck <teirllm@auburn.edu>
2 12
3 * buffers.texi (Select Buffer): Document `C-u M-g M-g'. 13 * buffers.texi (Select Buffer): Document `C-u M-g M-g'.
@@ -114,6 +124,7 @@
114 124
115 * building.texi (Debugger Operation): Clarify previous change. 125 * building.texi (Debugger Operation): Clarify previous change.
116 126
127>>>>>>> 1.574
1172005-04-29 Carsten Dominik <dominik@science.uva.nl> 1282005-04-29 Carsten Dominik <dominik@science.uva.nl>
118 129
119 * org.texi: Version 3.08, structure reorganized. 130 * org.texi: Version 3.08, structure reorganized.