[Erc-commit] [commit][emacs22] Add category for ERC 5.2.

[mwolson]

commit a12c64de18eb2fa90e98fc0b588b82c173e2c317
Merge: 9d157e3... 05bcaf3...
Author: Michael Olson <address@hidden>
Date:   Thu Feb 16 00:44:34 2006 +0000

    Add category for ERC 5.2.
    
    * NEWS: Add category for ERC 5.2.
    git-archimport-id: address@hidden/erc--cvs--0--patch-122

diff --cc ChangeLog
index f3d0d06,cbb9e1d..63c92ea
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,3 +1,11 @@@
 +2006-02-15  Michael Olson  <address@hidden>
 +
++      * NEWS: Add category for ERC 5.2.
++
 +      * erc.el (erc): Move to the end of the buffer when a continued
 +      session is detected.  Thanks to e1f and indio for the report and
 +      testing a potential fix.
 +
  2006-02-14  Michael Olson  <address@hidden>
  
        * debian/changelog: Prepare a new Debian package.
diff --cc NEWS
index d3a318e,af787c0..953daa9
--- a/NEWS
+++ b/NEWS
@@@ -1,13 -1,11 +1,15 @@@
  ERC NEWS                                                       -*- outline -*-
  
- * Changes since ERC 5.1.1
 -* Changes in ERC 5.1.2
++* Changes in ERC 5.2 (unreleased)
  
 -** Go back to using ssl.el so that SSL connections work as expected.
 -Connecting with `open-tls-stream' only seems to work (if at all?) when
 -using the tls.el located in lisp/net/ in Emacs22.
 +** New modules
 +
 +*** Capab identify (erc-capab.el)
 +
 +**** Mark unidentified users on servers supporting CAPAB IDENTIFY-MSG.
 +
++* Changes in ERC 5.1.2 (unreleased)
+ 
  ** Fix compiler errors in erc-autojoin.el and erc-dcc.el.
  
  ** Changes and additions to modules