Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca

[gnu-emacs] / admin / notes / copyright

diff --git a/admin/notes/copyright b/admin/notes/copyright
index 67a5d0b6638958043c7f3e7b43fe0b8d43254d79..3a404b69678a79f8ffe604df488bbc872aba7fa0 100644 (file)
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -380,7 +380,7 @@ Makefile.in does now.
 src/gmalloc.c
   - contains numerous copyrights from the GNU C library. Leave them alone.
 
-src/ndir.h
+nt/inc/dirent.h
   - see comments below. This file is OK to be released with Emacs
   22, but we may want to revisit it afterwards.
 
@@ -429,7 +429,7 @@ admin/check-doc-strings
   File says it's in the public domain, but that might not make it so.
 
 etc/e/eterm-color.ti
-src/ndir.h
+nt/inc/dirent.h
   On legal advice from Matt Norwood, the following comment was added
   to these files in Feb/Mar 2007: