diff options
| author | Eli Zaretskii | 2010-03-28 09:04:11 -0400 |
|---|---|---|
| committer | Eli Zaretskii | 2010-03-28 09:04:11 -0400 |
| commit | e7dbdb6dfc3ffdc25f8d32a43683500f596d9784 (patch) | |
| tree | e7e73d34fe234175f7da59690ec5abf6f73b89a7 /admin/notes/copyright | |
| parent | 34689d3c1ad54fd463d5f20c64bb1ac655dc5741 (diff) | |
| parent | 22ef1944028e9ac89a9717439b175ce3230a4ba1 (diff) | |
| download | emacs-e7dbdb6dfc3ffdc25f8d32a43683500f596d9784.tar.gz emacs-e7dbdb6dfc3ffdc25f8d32a43683500f596d9784.zip | |
Merge from mainline.
Diffstat (limited to 'admin/notes/copyright')
| -rw-r--r-- | admin/notes/copyright | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/admin/notes/copyright b/admin/notes/copyright index f4ceb273c73..e0389212304 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright | |||
| @@ -221,6 +221,11 @@ lib-src/etags.c | |||
| 221 | lib-src/getopt1.c, getopt_int.h | 221 | lib-src/getopt1.c, getopt_int.h |
| 222 | - these are from the GNU C library. Leave the copyrights alone. | 222 | - these are from the GNU C library. Leave the copyrights alone. |
| 223 | 223 | ||
| 224 | lisp/cedet/semantic/imenu.el | ||
| 225 | - See http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg00410.html | ||
| 226 | in which Eric Ludlam established that the remaining contributions | ||
| 227 | from authors other than himself were negligible. | ||
| 228 | |||
| 224 | lisp/play/tetris.el | 229 | lisp/play/tetris.el |
| 225 | - no special rules about the copyright. We note here that we believe | 230 | - no special rules about the copyright. We note here that we believe |
| 226 | (2007/1) there is no problem with our use of the name "tetris" or | 231 | (2007/1) there is no problem with our use of the name "tetris" or |