diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-03 14:35:41 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-03 14:35:41 -0800 |
| commit | 2c82deee7fbb951a90ed3246350fbf9390af038a (patch) | |
| tree | 465aaf0fdaefea778317ab1ed5c48400f223b596 /admin/MAINTAINERS | |
| parent | 6eab3936c71951e304f13b69ad2e835ddaf9f2f4 (diff) | |
| parent | c0ba5908b117170995df36e839a087af7c5f79db (diff) | |
| download | emacs-2c82deee7fbb951a90ed3246350fbf9390af038a.tar.gz | |
Merge from origin/emacs-24
c0ba590 Fix vertical-motion and posn-at-point when word-wrap is
a323b93 Better multi-line input support in comint.el
008a04a todo-mode.el: Restore point on setting item done (Bug#19727)
9615c0d doc/misc/erc.texi: fix typo
c648717 Update ERC docs and update MAINTANERS to include myself
d825f66 Fix filling circle/ellipse in Artist Mode (Bug#19763)
Conflicts:
admin/ChangeLog
doc/misc/ChangeLog
doc/misc/erc.texi
lisp/ChangeLog
src/ChangeLog
Diffstat (limited to 'admin/MAINTAINERS')
| -rw-r--r-- | admin/MAINTAINERS | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index 57f199b27c2..61c70c1e82c 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -78,6 +78,11 @@ Bastien Guerry 2. ============================================================================== +Kelvin White + ERC + lisp/erc/* + doc/misc/erc.texi + Eli Zaretskii doc/* lispref/* |