aboutsummaryrefslogtreecommitdiffstats
path: root/etc/ChangeLog
diff options
context:
space:
mode:
authorChong Yidong2010-09-23 15:00:31 -0400
committerChong Yidong2010-09-23 15:00:31 -0400
commit266a86bd7fedf743225c2497956b73ecb2245196 (patch)
tree7d0c8b128070eac293ce2606acb4e55de5843ba8 /etc/ChangeLog
parent29cdc13ed61e5a64ba30df1030029898a26b7947 (diff)
parentaf3ccb5cc061bccab1c9b024ea444d01c0767767 (diff)
downloademacs-266a86bd7fedf743225c2497956b73ecb2245196.tar.gz
emacs-266a86bd7fedf743225c2497956b73ecb2245196.zip
Merge changes from emacs-23 branch
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 84754efb148..5b78767cfda 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
12010-09-21 Eric Ludlam <zappo@gnu.org>
2
3 * srecode/java.srt: Make NAME be a prompt.
4
12010-09-13 Michael Albinus <michael.albinus@gmx.de> 52010-09-13 Michael Albinus <michael.albinus@gmx.de>
2 6
3 * NEWS: Some Tramp methods are discontinued. 7 * NEWS: Some Tramp methods are discontinued.