Mercurial > emacs
comparison lisp/erc/ChangeLog @ 107420:961da90b22a3
Merge from trunk
author | Jan D. <jan.h.d@swipnet.se> |
---|---|
date | Thu, 11 Mar 2010 11:05:39 +0100 |
parents | b4d27afff1bf |
children | 973b5bc5fcfe |
comparison
equal
deleted
inserted
replaced
107419:fec42ef390ce | 107420:961da90b22a3 |
---|---|
1 2010-03-10 Chong Yidong <cyd@stupidchicken.com> | |
2 | |
3 * Branch for 23.2. | |
4 | |
1 2010-02-07 Vivek Dasmohapatra <vivek@etla.org> | 5 2010-02-07 Vivek Dasmohapatra <vivek@etla.org> |
2 | 6 |
3 * erc-services.el (erc-nickserv-alist): Fix defcustom type (Bug#5520). | 7 * erc-services.el (erc-nickserv-alist): Fix defcustom type (Bug#5520). |
4 | 8 |
5 2010-01-25 Vivek Dasmohapatra <vivek@etla.org> | 9 2010-01-25 Vivek Dasmohapatra <vivek@etla.org> |