aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorkwhite2015-02-04 11:23:10 -0500
committerkwhite2015-02-04 11:23:10 -0500
commitc6487170e39e5b58872e935c95e8d033554501f7 (patch)
tree8247ddd24e1e4acb86c85404e4f0bc8c6a88930b /admin
parentd825f66db83501588f1c84aa4d78e644e0d5f896 (diff)
downloademacs-c6487170e39e5b58872e935c95e8d033554501f7.tar.gz
emacs-c6487170e39e5b58872e935c95e8d033554501f7.zip
Update ERC docs and update MAINTANERS to include myself
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog4
-rw-r--r--admin/MAINTAINERS5
2 files changed, 9 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 88d996532e0..0f70469fc0c 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
12015-02-04 Kelvin White <kwhite@gnu.org>
2
3 * MAINTAINERS: Add myself to section 2
4
12015-02-02 Glenn Morris <rgm@gnu.org> 52015-02-02 Glenn Morris <rgm@gnu.org>
2 6
3 * admin.el (manual-meta-string): Use bug-gnu-emacs@gnu email address 7 * admin.el (manual-meta-string): Use bug-gnu-emacs@gnu email address
diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS
index 1a5c64191ff..04942a8c3c9 100644
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@ -78,6 +78,11 @@ Bastien Guerry
782. 782.
79============================================================================== 79==============================================================================
80 80
81Kelvin White
82 ERC
83 lisp/erc/*
84 doc/misc/erc.texi
85
81Eli Zaretskii 86Eli Zaretskii
82 doc/* 87 doc/*
83 lispref/* 88 lispref/*