diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-07 12:42:11 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-07 12:42:11 -0800 |
| commit | 2b3f5bc80a2b8a7496a5d87cc98ffcce44e7b32e (patch) | |
| tree | 0f8e136e47266b4bc4fa38ce543686edf4440f8e /admin | |
| parent | f56e0e7a85978026b611bc8f28bdb91d7f8130d4 (diff) | |
| download | emacs-2b3f5bc80a2b8a7496a5d87cc98ffcce44e7b32e.tar.gz | |
* install-sh, mkinstalldirs, move-if-change: Update from master
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 8 | ||||
| -rw-r--r-- | admin/notes/copyright | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index d008c14e5f4..07ed0179db0 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,4 +1,10 @@ -2011-01-02 Paul Eggert <eggert@cs.ucla.edu> +2011-01-07 Paul Eggert <eggert@cs.ucla.edu> + + * notes/copyright: There's only one install-sh, not two, so fix a + typo claiming that there's two. Add move-if-change to the list of + GPL files imported from gnulib. + +2011-01-07 Paul Eggert <eggert@cs.ucla.edu> * notes/copyright: Report status more accurately for non-GPL files. Report copyright status more accurately for mkinstalldirs, diff --git a/admin/notes/copyright b/admin/notes/copyright index 02aa3ba79c6..174d124f39d 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright @@ -138,8 +138,7 @@ configure m4/getopt.m4 - copyright FSF, with MIT-like license -<top-level>/install-sh -lispintro/install-sh +install-sh - this file is copyright MIT, which is OK. Leave the copyright alone. mkinstalldirs @@ -621,6 +620,7 @@ of writing) GPL >= 2. rms says may as well leave the licenses of these alone (may import them from Gnulib again). These are: Gnulib: + move-if-change src/getloadavg.c src/gmalloc.c src/md5.c |