Mercurial > emacs
comparison lisp/erc/ChangeLog.02 @ 107617:c5f9e4613394
Merge from mainline.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sat, 16 Jan 2010 06:57:09 -0500 |
| parents | 1d1d5d9bd884 |
| children | 376148b31b5e |
comparison
equal
deleted
inserted
replaced
| 107616:fa5ad3eee9f5 | 107617:c5f9e4613394 |
|---|---|
| 2594 Default it is used for URLs, but other things could be added. | 2594 Default it is used for URLs, but other things could be added. |
| 2595 see if you can find another use, erc-button-alist | 2595 see if you can find another use, erc-button-alist |
| 2596 | 2596 |
| 2597 See ChangeLog.01 for earlier changes. | 2597 See ChangeLog.01 for earlier changes. |
| 2598 | 2598 |
| 2599 Copyright (C) 2002, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | 2599 Copyright (C) 2002, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
| 2600 | 2600 |
| 2601 This file is part of GNU Emacs. | 2601 This file is part of GNU Emacs. |
| 2602 | 2602 |
| 2603 GNU Emacs is free software: you can redistribute it and/or modify | 2603 GNU Emacs is free software: you can redistribute it and/or modify |
| 2604 it under the terms of the GNU General Public License as published by | 2604 it under the terms of the GNU General Public License as published by |