diff options
| author | Kenichi Handa | 2011-12-05 16:03:31 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2011-12-05 16:03:31 +0900 |
| commit | 2ab04b956544fc24132cee405f93c1a757ebca56 (patch) | |
| tree | f8ff3a51bac0430ed69b6497568de699f6d3b904 /admin | |
| parent | a79703f53ccd12623371263d93baf0d1be928ec7 (diff) | |
| parent | 58a70b943c3efcc25e1396c8e67bc440c43a3f0a (diff) | |
| download | emacs-2ab04b956544fc24132cee405f93c1a757ebca56.tar.gz emacs-2ab04b956544fc24132cee405f93c1a757ebca56.zip | |
merge trunk
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index e4a04763061..bfac347eb15 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS | |||
| @@ -99,6 +99,7 @@ Eli Zaretskii | |||
| 99 | src/xfaces.c | 99 | src/xfaces.c |
| 100 | src/xdisp.c | 100 | src/xdisp.c |
| 101 | src/term.c | 101 | src/term.c |
| 102 | src/dispnew.c | ||
| 102 | src/frame.c | 103 | src/frame.c |
| 103 | src/dired.c | 104 | src/dired.c |
| 104 | 105 | ||
| @@ -108,6 +109,7 @@ Eli Zaretskii | |||
| 108 | lisp/info.el | 109 | lisp/info.el |
| 109 | lisp/ls-lisp.el | 110 | lisp/ls-lisp.el |
| 110 | lisp/startup.el | 111 | lisp/startup.el |
| 112 | lisp/w32*.el | ||
| 111 | 113 | ||
| 112 | Stefan Monnier | 114 | Stefan Monnier |
| 113 | src/intervals.c | 115 | src/intervals.c |
| @@ -148,7 +150,6 @@ src/coding.c | |||
| 148 | src/composite.c | 150 | src/composite.c |
| 149 | src/config.in | 151 | src/config.in |
| 150 | src/data.c | 152 | src/data.c |
| 151 | src/dispnew.c | ||
| 152 | src/doc.c | 153 | src/doc.c |
| 153 | src/doprnt.c | 154 | src/doprnt.c |
| 154 | src/ecrt0.c | 155 | src/ecrt0.c |
| @@ -214,7 +215,6 @@ src/w32term.c | |||
| 214 | src/w32xfns.c | 215 | src/w32xfns.c |
| 215 | src/widget.c | 216 | src/widget.c |
| 216 | src/window.c | 217 | src/window.c |
| 217 | src/xdisp.c | ||
| 218 | src/xfns.c | 218 | src/xfns.c |
| 219 | src/xmenu.c | 219 | src/xmenu.c |
| 220 | src/xrdb.c | 220 | src/xrdb.c |