diff options
| author | Glenn Morris <[email protected]> | 2011-02-27 17:07:29 -0800 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2011-02-27 17:07:29 -0800 |
| commit | 2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb (patch) | |
| tree | b924eb1c22ab3bce643676162ef039f250782661 /lisp/erc/ChangeLog.01 | |
| parent | df7f0d0b10ce31a6f1a8b7e979e120c695699d5a (diff) | |
| parent | d1f61aaf6f0b6a2cf2bbb7eaf5631f8b580568d4 (diff) | |
Merge from emacs-23; up to 2010-06-03T05:41:[email protected].
Diffstat (limited to 'lisp/erc/ChangeLog.01')
| -rw-r--r-- | lisp/erc/ChangeLog.01 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/erc/ChangeLog.01 b/lisp/erc/ChangeLog.01 index 962acd5bfc..4016586abc 100644 --- a/lisp/erc/ChangeLog.01 +++ b/lisp/erc/ChangeLog.01 @@ -584,9 +584,9 @@ * debian/maint/conffiles.in: new file - * debian/maint/conffiles: superceded by conffiles.in + * debian/maint/conffiles: superseded by conffiles.in - * debian/scripts/startup: superceded by startup.erc + * debian/scripts/startup: superseded by startup.erc 2001-10-25 Mario Lang <[email protected]> @@ -609,7 +609,7 @@ * debian/maint/postinst, debian/maint/prerm, debian/scripts/install, debian/scripts/remove: - removed, superceded by it's .in counterpart + removed, superseded by its .in counterpart 2001-10-25 Mario Lang <[email protected]> |