diff options
| author | Eli Zaretskii | 2012-12-10 14:08:02 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-12-10 14:08:02 +0200 |
| commit | 3907e630a71d48e693062b350571990d7ba08bbb (patch) | |
| tree | 2be1ecc0796e42c7a453a9fd5131eb5866f79876 /admin/notes | |
| parent | cf2d22b874ca2df0072e32ee641e8efffe4abd6d (diff) | |
| parent | 81606b10501169a5671061b8461bbc32dcec8705 (diff) | |
| download | emacs-3907e630a71d48e693062b350571990d7ba08bbb.tar.gz emacs-3907e630a71d48e693062b350571990d7ba08bbb.zip | |
Merge from trunk + rename the event. Not tested yet.
Diffstat (limited to 'admin/notes')
| -rw-r--r-- | admin/notes/copyright | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/admin/notes/copyright b/admin/notes/copyright index 72b7d7e2d23..173ff83343a 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright | |||
| @@ -380,7 +380,7 @@ Makefile.in does now. | |||
| 380 | src/gmalloc.c | 380 | src/gmalloc.c |
| 381 | - contains numerous copyrights from the GNU C library. Leave them alone. | 381 | - contains numerous copyrights from the GNU C library. Leave them alone. |
| 382 | 382 | ||
| 383 | src/ndir.h | 383 | nt/inc/dirent.h |
| 384 | - see comments below. This file is OK to be released with Emacs | 384 | - see comments below. This file is OK to be released with Emacs |
| 385 | 22, but we may want to revisit it afterwards. | 385 | 22, but we may want to revisit it afterwards. |
| 386 | 386 | ||
| @@ -429,7 +429,7 @@ admin/check-doc-strings | |||
| 429 | File says it's in the public domain, but that might not make it so. | 429 | File says it's in the public domain, but that might not make it so. |
| 430 | 430 | ||
| 431 | etc/e/eterm-color.ti | 431 | etc/e/eterm-color.ti |
| 432 | src/ndir.h | 432 | nt/inc/dirent.h |
| 433 | On legal advice from Matt Norwood, the following comment was added | 433 | On legal advice from Matt Norwood, the following comment was added |
| 434 | to these files in Feb/Mar 2007: | 434 | to these files in Feb/Mar 2007: |
| 435 | 435 | ||